[mozzes] r22 committed - Pom file corrections....

0 views

Skip to first unread message

moz...@googlecode.com

unread,

Mar 3, 2010, 3:13:41 AM3/3/10

to mozzes-d...@googlegroups.com

Revision: 22
Author: perica.milosevic
Date: Wed Mar 3 00:07:58 2010
Log: Pom file corrections.
Minor modifications.
http://code.google.com/p/mozzes/source/detail?r=22

Modified:

/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleRestJersey/pom.xml

/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleRestJersey/src/main/java/org/mozzes/application/example/rest/jersey/RestOneTeamService.java

/trunk/mozzesApplication/mozzesApplicationRestJersey/src/main/java/org/mozzes/rest/jersey/RestJerseyModule.java

/trunk/mozzesApplication/mozzesApplicationRestJersey/src/main/java/org/mozzes/rest/jersey/RestJerseyServerListener.java

/trunk/mozzesApplication/mozzesApplicationServer/src/main/java/org/mozzes/application/server/internal/MozzesInternal.java

/trunk/mozzesSwing/src/main/java/org/mozzes/swing/component/table/NumberValidationCellEditor.java

/trunk/mozzesSwing/src/main/java/org/mozzes/swing/component/table/PositiveNumberCellEditor.java

/trunk/mozzesSwing/src/main/java/org/mozzes/swing/mgf/datarenderer/combobox/CustomComboBoxModel.java

/trunk/mozzesSwing/src/main/java/org/mozzes/swing/mgf/datarenderer/list/CustomListModel.java

/trunk/mozzesSwing/src/main/java/org/mozzes/swing/mgf/datarenderer/table/CustomTableModel.java

/trunk/mozzesSwing/src/test/java/org/mozzes/swing/mgf/datasource/AbstractDataSourceTest.java
/trunk/mozzesUtils/src/main/java/org/mozzes/utils/CollectionUtils.java
/trunk/mozzesUtils/src/test/java/org/mozzes/utils/CollectionUtilsTest.java

=======================================
---
/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleRestJersey/pom.xml
Sat Feb 27 09:02:30 2010
+++
/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleRestJersey/pom.xml
Wed Mar 3 00:07:58 2010
@@ -1,16 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
-
+
<parent>
<artifactId>mozzesApplicationExample</artifactId>
<groupId>org.mozzes.application</groupId>
<version>trunk-SNAPSHOT</version>
</parent>
-
+
<groupId>org.mozzes.application</groupId>
<artifactId>mozzesApplicationExampleRestJersey</artifactId>
<name>Mozzes Application REST Example</name>
-
+
<dependencies>
<dependency>
<groupId>org.mozzes.application</groupId>
@@ -28,9 +28,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>xstream</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.2.2</version>
+ <version>1.3.1</version>
</dependency>
</dependencies>
<modelVersion>4.0.0</modelVersion>
=======================================
---
/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleRestJersey/src/main/java/org/mozzes/application/example/rest/jersey/RestOneTeamService.java
Sat Feb 27 06:56:25 2010
+++
/trunk/mozzesApplication/mozzesApplicationExample/mozzesApplicationExampleRestJersey/src/main/java/org/mozzes/application/example/rest/jersey/RestOneTeamService.java
Wed Mar 3 00:07:58 2010
@@ -51,7 +51,7 @@

@GET
@Produces( { MediaType.TEXT_XML })
- public String getCountry(@PathParam("teamId") String teamId) {
+ public String getTeam(@PathParam("teamId") String teamId) {
Integer id;
try {
id = Integer.parseInt(teamId);
=======================================
---
/trunk/mozzesApplication/mozzesApplicationRestJersey/src/main/java/org/mozzes/rest/jersey/RestJerseyModule.java
Sat Feb 27 06:56:25 2010
+++
/trunk/mozzesApplication/mozzesApplicationRestJersey/src/main/java/org/mozzes/rest/jersey/RestJerseyModule.java
Wed Mar 3 00:07:58 2010
@@ -27,8 +27,6 @@
import org.mozzes.application.module.ServerLifecycleListener;

import com.google.inject.Binder;
-import com.google.inject.Provider;
-import com.google.inject.Scopes;

/**
* Mozzes application module for REST Jersey implementation
@@ -44,13 +42,7 @@

@Override
public void doCustomBinding(Binder binder) {
- binder.bind(RestJerseyConfiguration.class).toProvider(new
Provider<RestJerseyConfiguration>() {
- @Override
- public RestJerseyConfiguration get() {
- return configuration;
-
- }
- }).in(Scopes.SINGLETON);
+ binder.bind(RestJerseyConfiguration.class).toInstance(configuration);
}

@Override
=======================================
---
/trunk/mozzesApplication/mozzesApplicationRestJersey/src/main/java/org/mozzes/rest/jersey/RestJerseyServerListener.java
Sat Feb 27 06:56:25 2010
+++
/trunk/mozzesApplication/mozzesApplicationRestJersey/src/main/java/org/mozzes/rest/jersey/RestJerseyServerListener.java
Wed Mar 3 00:07:58 2010
@@ -49,11 +49,6 @@
private Injector guiceInjector;

private SelectorThread threadSelector;
-
- @Override
- public void shutdown() {
- threadSelector.stopEndpoint();
- }

@Override
public void startup() throws ServerInitializationException {
@@ -62,7 +57,7 @@
final Map<String, String> initParams = new HashMap<String, String>();
initParams.put("com.sun.jersey.config.property.packages",
configuration.getRootResourcePackage());

- logger.info("Starting grizzly...");
+ logger.info("Starting grizzly on " + configuration.getBaseUri());
try {
threadSelector =
GrizzlyWebContainerFactory.create(configuration.getBaseUri(), initParams);
} catch (IllegalArgumentException e) {
@@ -73,4 +68,9 @@
throw new ServerInitializationException(e);
}
}
-}
+
+ @Override
+ public void shutdown() {
+ threadSelector.stopEndpoint();
+ }
+}
=======================================
---
/trunk/mozzesApplication/mozzesApplicationServer/src/main/java/org/mozzes/application/server/internal/MozzesInternal.java
Sat Feb 27 06:56:25 2010
+++
/trunk/mozzesApplication/mozzesApplicationServer/src/main/java/org/mozzes/application/server/internal/MozzesInternal.java
Wed Mar 3 00:07:58 2010
@@ -25,11 +25,13 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

+import org.mozzes.application.server.session.impl.SessionContext;
+
import com.google.inject.BindingAnnotation;

/**
* The Interface MozzesInternal is used in guice configuration for
specifying that some internal framework classes(for
- * example {@linkSessionContext}) can be injected only if this annotation
is present. <br>
+ * example {@link SessionContext}) can be injected only if this annotation
is present. <br>
*
* With this mechanism we provided some level of security that users at
least can't inject some internal classes easily.
*
=======================================
---
/trunk/mozzesSwing/src/main/java/org/mozzes/swing/component/table/NumberValidationCellEditor.java
Sat Feb 27 06:56:25 2010
+++
/trunk/mozzesSwing/src/main/java/org/mozzes/swing/component/table/NumberValidationCellEditor.java
Wed Mar 3 00:07:58 2010
@@ -34,20 +34,15 @@

/**
- * [FIN-77] Cell editor koji vrshi validaciju da li su u pitanju brojevi (u
+ * Cell editor koji vrshi validaciju da li su u pitanju brojevi (u
* zavisnosti od klase u table modelu) i da li su validni sto se odredjuje
na
* osnovu poziva metode isNumberValid() koja se mozhe preklopiti. Ukoliko
unos
* nije validan sprechava se prestanak editovanja cjelije i uokviruje se
* odgovarajucjom bojom.
*
- * @author nenadl
- *
*/
public class NumberValidationCellEditor extends GenericEditor {

- /**
- * Svuid.
- */
private static final long serialVersionUID = -7584667054021231532L;

/**
@@ -66,7 +61,6 @@
/**
* Construktor of {@link NumberValidationCellEditor} object
* @param cellStrLength Max length of the String that will be aceepted as
input.
- * @author draganm
*/
public NumberValidationCellEditor(final AmountFormatter amountFormatter,
int cellStrLength) {
super(cellStrLength);
=======================================
---
/trunk/mozzesSwing/src/main/java/org/mozzes/swing/component/table/PositiveNumberCellEditor.java
Sat Feb 27 06:56:25 2010
+++
/trunk/mozzesSwing/src/main/java/org/mozzes/swing/component/table/PositiveNumberCellEditor.java
Wed Mar 3 00:07:58 2010
@@ -25,7 +25,6 @@
/**
* Editor za celije tabele koji omogucava samo unos
* pozitivnog broja ili nule
- * @author vaso
*/
public class PositiveNumberCellEditor extends NumberValidationCellEditor {

@@ -40,7 +39,6 @@
/**
* Construktor
* @param cellStrLength Max length of the String that will be aceepted as
input.
- * @author draganm
*/
public PositiveNumberCellEditor(final AmountFormatter amountFormatter,
int cellStrLength) {
super(amountFormatter, cellStrLength);
=======================================
---
/trunk/mozzesSwing/src/main/java/org/mozzes/swing/mgf/datarenderer/combobox/CustomComboBoxModel.java
Sat Feb 27 06:56:25 2010
+++
/trunk/mozzesSwing/src/main/java/org/mozzes/swing/mgf/datarenderer/combobox/CustomComboBoxModel.java
Wed Mar 3 00:07:58 2010
@@ -306,7 +306,7 @@
fireContentsChanged(this, event.getIndex(), event.getIndex());
}

- private void rowsUpdated(@SuppressWarnings("unused")
ObjectsUpdatedEvent<T> event) {
+ private void rowsUpdated(ObjectsUpdatedEvent<T> event) {
// fireContentsChanged(this, event.getIndex(), event.getIndex() +
event.getObjects().size() - 1);
fireAllRowsUpdated();
}
@@ -315,7 +315,7 @@
fireContentsChanged(this, 0, getLastIndex());
}

- private void rowsDeleted(@SuppressWarnings("unused")
ObjectsRemovedEvent<T> event) {
+ private void rowsDeleted(ObjectsRemovedEvent<T> event) {
fireIntervalRemoved(this, 0, getLastIndex());
}

=======================================
---
/trunk/mozzesSwing/src/main/java/org/mozzes/swing/mgf/datarenderer/list/CustomListModel.java
Sat Feb 27 06:56:25 2010
+++
/trunk/mozzesSwing/src/main/java/org/mozzes/swing/mgf/datarenderer/list/CustomListModel.java
Wed Mar 3 00:07:58 2010
@@ -232,12 +232,12 @@
fireContentsChanged(this, event.getIndex(), event.getIndex());
}

- private void rowsDeleted(@SuppressWarnings("unused")
ObjectsRemovedEvent<T> event) {
+ private void rowsDeleted(ObjectsRemovedEvent<T> event) {
// fireIntervalRemoved(this, event.getIndex(), event.getIndex() +
event.getObjects().size() - 1);
fireIntervalRemoved(this, 0, getLastIndex());
}
=======================================
---
/trunk/mozzesSwing/src/main/java/org/mozzes/swing/mgf/datarenderer/table/CustomTableModel.java
Sat Feb 27 06:56:25 2010
+++
/trunk/mozzesSwing/src/main/java/org/mozzes/swing/mgf/datarenderer/table/CustomTableModel.java
Wed Mar 3 00:07:58 2010
@@ -294,12 +294,12 @@
fireTableRowsUpdated(event.getIndex(), event.getIndex());
}

- private void rowsUpdated(@SuppressWarnings("unused")
ObjectsUpdatedEvent<T> event) {
+ private void rowsUpdated(ObjectsUpdatedEvent<T> event) {
// fireTableRowsUpdated(event.getIndex(), event.getIndex() +
event.getObjects().size() - 1);
fireTableRowsUpdated(0, getLastIndex());
}

- private void rowsDeleted(@SuppressWarnings("unused")
ObjectsRemovedEvent<T> event) {
+ private void rowsDeleted(ObjectsRemovedEvent<T> event) {
// fireTableRowsDeleted(event.getIndex(), event.getIndex() +
event.getObjects().size() - 1);
fireTableDataChanged();
}
=======================================
---
/trunk/mozzesSwing/src/test/java/org/mozzes/swing/mgf/datasource/AbstractDataSourceTest.java
Sat Feb 27 06:56:25 2010
+++
/trunk/mozzesSwing/src/test/java/org/mozzes/swing/mgf/datasource/AbstractDataSourceTest.java
Wed Mar 3 00:07:58 2010
@@ -217,7 +217,7 @@
}
}

- private void handleSourceChanged(@SuppressWarnings("unused")
SourceChangedEvent<DummyClass> event) {
+ private void handleSourceChanged(SourceChangedEvent<DummyClass> event) {
handleCalled = true;
}
}
=======================================
--- /trunk/mozzesUtils/src/main/java/org/mozzes/utils/CollectionUtils.java
Sat Feb 27 06:56:25 2010
+++ /trunk/mozzesUtils/src/main/java/org/mozzes/utils/CollectionUtils.java
Wed Mar 3 00:07:58 2010
@@ -55,27 +55,6 @@
T[] array = (T[]) Array.newInstance(clazz, collection.size());
return collection.toArray(array);
}
-
- /**
- * Vraca listu u kojoj se nalaze samo elementi iz prve liste, koji se ne
nalaze u drugoj listi.
- *
- * @param <T> - tip objekta koji se nalazi u listama
- * @param c1 - Kolekcija iz koje se izbacuju elementi koji se nalaze u
drugoj kolekciji
- * @param c2 - Kolekcija sa kojom se nalaze elementi, koji ne treba da se
nalaze u kolekciji koja je rezultat
- * @return Kolekcija(Lista) elemenata iz prve kolekcije, koji se ne
nalaze u drugoj kolekciji
- * @author Milorad
- */
- public static <T> Collection<T> subtract(Collection<T> c1, Collection<T>
c2) {
- if (c1 == null)
- throw new NullPointerException();
-
- Collection<T> result = CollectionUtils.copy(c1);
- if (c2 != null) {
- result.removeAll(c2);
- }
-
- return result;
- }

/**
* @param collection Kolekcija koju treba kopirati
=======================================
---
/trunk/mozzesUtils/src/test/java/org/mozzes/utils/CollectionUtilsTest.java
Sat Feb 27 06:56:25 2010
+++
/trunk/mozzesUtils/src/test/java/org/mozzes/utils/CollectionUtilsTest.java
Wed Mar 3 00:07:58 2010
@@ -20,19 +20,22 @@
*/
package org.mozzes.utils;

-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashSet;

import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.junit.Test;
-import org.mozzes.utils.CollectionUtils;

public class CollectionUtilsTest {

@@ -114,40 +117,6 @@
};
assertThat(CollectionUtils.asArray(String.class, s), matcher);
}
-
- @Test
- public void testSubtract() {
- Collection<String> c1 = null;
- Collection<String> c2 = null;
- Collection<String> diff = new ArrayList<String>();
-
- try {
- CollectionUtils.subtract(c1, c2);
- fail();
- } catch (NullPointerException e) {
- assertTrue(true);
- }
-
- c1 = new ArrayList<String>();
- assertEquals(c1, CollectionUtils.subtract(c1, c2));
- assertNotSame(c1, CollectionUtils.subtract(c1, c2));
-
- c1.add("aaa");
- assertEquals(c1, CollectionUtils.subtract(c1, c2));
-
- c2 = new ArrayList<String>();
- assertEquals(c1, CollectionUtils.subtract(c1, c2));
-
- c2.add("bbb");
- assertEquals(c1, CollectionUtils.subtract(c1, c2));
-
- c2.add("aaa");
- assertEquals(Collections.EMPTY_LIST, CollectionUtils.subtract(c1, c2));
-
- c1.add("ccc");
- diff.add("ccc");
- assertEquals(diff, CollectionUtils.subtract(c1, c2));
- }