[exo-jcr-commits] exo-jcr SVN: r5699 - in ws/branches/2.3.x: exo.ws.commons and 6 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Feb 27 06:05:13 EST 2012


Author: andrew.plotnikov
Date: 2012-02-27 06:05:12 -0500 (Mon, 27 Feb 2012)
New Revision: 5699

Added:
   ws/branches/2.3.x/exo.ws.rest.ext/src/test/resources/tsm-excludes.properties
Modified:
   ws/branches/2.3.x/exo.ws.commons/pom.xml
   ws/branches/2.3.x/exo.ws.frameworks.json/pom.xml
   ws/branches/2.3.x/exo.ws.frameworks.servlet/pom.xml
   ws/branches/2.3.x/exo.ws.rest.core/pom.xml
   ws/branches/2.3.x/exo.ws.rest.ext/pom.xml
   ws/branches/2.3.x/exo.ws.rest.ext/src/test/java/org/exoplatform/services/rest/ext/groovy/GroovyDependenciesTest.java
   ws/branches/2.3.x/exo.ws.rest.ext/src/test/java/org/exoplatform/services/rest/ext/groovy/GroovySecureRestrictionTest.java
   ws/branches/2.3.x/pom.xml
Log:
EXOJCR-1771: Checked the scope and the dependency list of each project

Modified: ws/branches/2.3.x/exo.ws.commons/pom.xml
===================================================================
--- ws/branches/2.3.x/exo.ws.commons/pom.xml	2012-02-24 14:04:44 UTC (rev 5698)
+++ ws/branches/2.3.x/exo.ws.commons/pom.xml	2012-02-27 11:05:12 UTC (rev 5699)
@@ -68,7 +68,7 @@
                   <id>prepare-test-policy</id>
                   <phase>process-test-resources</phase>
                   <configuration>
-                     <tasks>
+                     <target>
                         <echo>Creating Access Policy for tests</echo>
                         <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
                         <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -83,7 +83,7 @@
                               <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
                            </filterset>
                         </copy>
-                     </tasks>
+                     </target>
                   </configuration>
                   <goals>
                      <goal>run</goal>

Modified: ws/branches/2.3.x/exo.ws.frameworks.json/pom.xml
===================================================================
--- ws/branches/2.3.x/exo.ws.frameworks.json/pom.xml	2012-02-24 14:04:44 UTC (rev 5698)
+++ ws/branches/2.3.x/exo.ws.frameworks.json/pom.xml	2012-02-27 11:05:12 UTC (rev 5699)
@@ -80,7 +80,7 @@
                   <id>prepare-test-policy</id>
                   <phase>process-test-resources</phase>
                   <configuration>
-                     <tasks>
+                     <target>
                         <echo>Creating Access Policy for tests</echo>
                         <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
                         <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -95,7 +95,7 @@
                               <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
                            </filterset>
                         </copy>
-                     </tasks>
+                     </target>
                   </configuration>
                   <goals>
                      <goal>run</goal>

Modified: ws/branches/2.3.x/exo.ws.frameworks.servlet/pom.xml
===================================================================
--- ws/branches/2.3.x/exo.ws.frameworks.servlet/pom.xml	2012-02-24 14:04:44 UTC (rev 5698)
+++ ws/branches/2.3.x/exo.ws.frameworks.servlet/pom.xml	2012-02-27 11:05:12 UTC (rev 5699)
@@ -39,10 +39,6 @@
       </dependency>
       <dependency>
          <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.component.common</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
          <artifactId>exo.kernel.commons</artifactId>
       </dependency>
       <dependency>

Modified: ws/branches/2.3.x/exo.ws.rest.core/pom.xml
===================================================================
--- ws/branches/2.3.x/exo.ws.rest.core/pom.xml	2012-02-24 14:04:44 UTC (rev 5698)
+++ ws/branches/2.3.x/exo.ws.rest.core/pom.xml	2012-02-27 11:05:12 UTC (rev 5699)
@@ -76,10 +76,6 @@
          <artifactId>picocontainer</artifactId>
       </dependency>
       <dependency>
-         <groupId>net.sf.jtidy</groupId>
-         <artifactId>jtidy</artifactId>
-      </dependency>
-      <dependency>
          <groupId>xpp3</groupId>
          <artifactId>xpp3</artifactId>        
       </dependency>
@@ -87,11 +83,6 @@
          <groupId>javax.xml.bind</groupId>
          <artifactId>jaxb-api</artifactId>
       </dependency>
-      <dependency>      
-         <groupId>org.jvnet.jaxb2.maven2</groupId>
-         <artifactId>maven-jaxb2-plugin</artifactId>
-         <scope>test</scope>
-      </dependency>
       <dependency>
          <groupId>javax.ws.rs</groupId>
          <artifactId>jsr311-api</artifactId>
@@ -186,7 +177,7 @@
                   <id>prepare-test-policy</id>
                   <phase>process-test-resources</phase>
                   <configuration>
-                     <tasks>
+                     <target>
                         <echo>Creating Access Policy for tests</echo>
                         <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
                         <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -201,7 +192,7 @@
                               <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
                            </filterset>
                         </copy>
-                     </tasks>
+                     </target>
                   </configuration>
                   <goals>
                      <goal>run</goal>

Modified: ws/branches/2.3.x/exo.ws.rest.ext/pom.xml
===================================================================
--- ws/branches/2.3.x/exo.ws.rest.ext/pom.xml	2012-02-24 14:04:44 UTC (rev 5698)
+++ ws/branches/2.3.x/exo.ws.rest.ext/pom.xml	2012-02-27 11:05:12 UTC (rev 5699)
@@ -71,10 +71,6 @@
 			<artifactId>jsr250-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.jtidy</groupId>
-			<artifactId>jtidy</artifactId>
-		</dependency>
-		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
          <scope>test</scope>
@@ -95,6 +91,10 @@
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-all</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>javax.xml.stream</groupId>
+			<artifactId>stax-api</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -112,7 +112,7 @@
                   <id>prepare-test-policy</id>
                   <phase>process-test-resources</phase>
                   <configuration>
-                     <tasks>
+                     <target>
                         <echo>Creating Access Policy for tests</echo>
                         <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
                         <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -127,7 +127,7 @@
                               <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
                            </filterset>
                         </copy>
-                     </tasks>
+                     </target>
                   </configuration>
                   <goals>
                      <goal>run</goal>

Modified: ws/branches/2.3.x/exo.ws.rest.ext/src/test/java/org/exoplatform/services/rest/ext/groovy/GroovyDependenciesTest.java
===================================================================
--- ws/branches/2.3.x/exo.ws.rest.ext/src/test/java/org/exoplatform/services/rest/ext/groovy/GroovyDependenciesTest.java	2012-02-24 14:04:44 UTC (rev 5698)
+++ ws/branches/2.3.x/exo.ws.rest.ext/src/test/java/org/exoplatform/services/rest/ext/groovy/GroovyDependenciesTest.java	2012-02-27 11:05:12 UTC (rev 5699)
@@ -55,4 +55,10 @@
       assertEquals("dependencies.Dep1", new String(writer.getBody()));
    }
 
+   @Override
+   public void tearDown() throws Exception
+   {
+      groovyPublisher.resources.clear();
+      super.tearDown();
+   }
 }

Modified: ws/branches/2.3.x/exo.ws.rest.ext/src/test/java/org/exoplatform/services/rest/ext/groovy/GroovySecureRestrictionTest.java
===================================================================
--- ws/branches/2.3.x/exo.ws.rest.ext/src/test/java/org/exoplatform/services/rest/ext/groovy/GroovySecureRestrictionTest.java	2012-02-24 14:04:44 UTC (rev 5698)
+++ ws/branches/2.3.x/exo.ws.rest.ext/src/test/java/org/exoplatform/services/rest/ext/groovy/GroovySecureRestrictionTest.java	2012-02-27 11:05:12 UTC (rev 5699)
@@ -52,4 +52,10 @@
       assertTrue(new String(writer.getBody()).startsWith("access denied"));
    }
 
+   @Override
+   public void tearDown() throws Exception
+   {
+      groovyPublisher.resources.clear();
+      super.tearDown();
+   }
 }

Added: ws/branches/2.3.x/exo.ws.rest.ext/src/test/resources/tsm-excludes.properties
===================================================================
--- ws/branches/2.3.x/exo.ws.rest.ext/src/test/resources/tsm-excludes.properties	                        (rev 0)
+++ ws/branches/2.3.x/exo.ws.rest.ext/src/test/resources/tsm-excludes.properties	2012-02-27 11:05:12 UTC (rev 5699)
@@ -0,0 +1 @@
+org.exoplatform.services.rest.ext.groovy.ExtendedClassLoaderTest.testParseClasses=parseClasses
\ No newline at end of file

Modified: ws/branches/2.3.x/pom.xml
===================================================================
--- ws/branches/2.3.x/pom.xml	2012-02-24 14:04:44 UTC (rev 5698)
+++ ws/branches/2.3.x/pom.xml	2012-02-27 11:05:12 UTC (rev 5699)
@@ -183,6 +183,11 @@
             <artifactId>javax.inject</artifactId>
             <version>1</version>
          </dependency>
+         <dependency>
+            <groupId>javax.xml.stream</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0-2</version>
+      </dependency>
       </dependencies>
    </dependencyManagement>
    <dependencies>



More information about the exo-jcr-commits mailing list