axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davidills...@apache.org
Subject svn commit: r479367 - in /webservices/axis2/trunk/java/modules: kernel/maven.xml kernel/pom.xml kernel/test-resources/j2secbuild.xml parent/pom.xml
Date Sun, 26 Nov 2006 14:41:48 GMT
Author: davidillsley
Date: Sun Nov 26 06:41:47 2006
New Revision: 479367

URL: http://svn.apache.org/viewvc?view=rev&rev=479367
Log:
Maven2 updates:
Update Woden to ws.zones repo SNAPSHOT dependency
Enable Java security tests in kernel module

Added:
    webservices/axis2/trunk/java/modules/kernel/test-resources/j2secbuild.xml
Modified:
    webservices/axis2/trunk/java/modules/kernel/maven.xml
    webservices/axis2/trunk/java/modules/kernel/pom.xml
    webservices/axis2/trunk/java/modules/parent/pom.xml

Modified: webservices/axis2/trunk/java/modules/kernel/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/maven.xml?view=diff&rev=479367&r1=479366&r2=479367
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/maven.xml Sun Nov 26 06:41:47 2006
@@ -18,36 +18,12 @@
             <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/outservice"/>
             <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/module1"/>
             <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/serviceModule"/>
+        	<ant:ant antfile="j2secbuild.xml" inheritall="true" inheritrefs="true" dir="test-resources/"/>
         </j:jelly>
         <ant:copy file="${basedir}/test-resources/deployment/axis2.xml" tofile="${basedir}/target/test-resources/deployment/axis2.xml"/>
       </j:if>
-
-      <mkdir dir="${maven.build.dir}/test-resources/java2sec/more"/>        
-      <mkdir dir="${maven.build.dir}/test-resources/java2sec/less"/>        
-
-      <ant:jar destfile="${maven.build.dir}/test-resources/java2sec/more/MorePermission.jar"
update="true">
-            <fileset dir="target/test-classes">
-                <include name="org/apache/axis2/java/security/driver/*"/>
-                <include name="org/apache/axis2/java/security/action/*"/>
-                <include name="org/apache/axis2/java/security/interf/*"/>
-                <include name="org/apache/axis2/java/security/more/*"/>
-            </fileset>
-      </ant:jar>
-      
-      <ant:delete dir="${basedir}/target/test-classes/org/apache/axis2/java/security/driver"
/>   
-      <ant:delete dir="${basedir}/target/test-classes/org/apache/axis2/java/security/more"
/>
-      <ant:delete dir="${basedir}/target/test-classes/org/apache/axis2/java/security/action"
/>
-      <ant:delete dir="${basedir}/target/test-classes/org/apache/axis2/java/security/interf"
/>
-       
-      <ant:jar destfile="${maven.build.dir}/test-resources/java2sec/less/LessPermission.jar"
update="true">
-            <fileset dir="target/test-classes">
-                <include name="org/apache/axis2/java/security/less/*"/>
-            </fileset>
-      </ant:jar>
-      
-      <ant:delete dir="${basedir}/target/test-classes/org/apache/axis2/java/security/less"
/>
-
     </postGoal>
+	
     <preGoal name="itest:compile">
         <u:file var="file" name="${maven.itest.src}"/>
         <j:if test="${!file.exists()}">

Modified: webservices/axis2/trunk/java/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/pom.xml?view=diff&rev=479367&r1=479366&r2=479367
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/pom.xml Sun Nov 26 06:41:47 2006
@@ -71,7 +71,7 @@
       <artifactId>neethi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.woden</groupId>
+      <groupId>incubator-woden</groupId>
       <artifactId>woden</artifactId>
     </dependency>
     <dependency>
@@ -141,6 +141,19 @@
 	            <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/serviceModule"/>
 	            <copy file="${basedir}/test-resources/deployment/axis2.xml" tofile="${basedir}/target/test-resources/deployment/axis2.xml"/>
               </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>test-compile</id>
+            <phase>test-compile</phase>
+            <configuration>
+              <tasks>
+				<property name="maven.build.dir" location="${basedir}/target"/>
+	            <ant antfile="j2secbuild.xml" inheritall="true" inheritrefs="true" dir="test-resources/"/>
+	         </tasks>
             </configuration>
             <goals>
               <goal>run</goal>

Added: webservices/axis2/trunk/java/modules/kernel/test-resources/j2secbuild.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/j2secbuild.xml?view=auto&rev=479367
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test-resources/j2secbuild.xml (added)
+++ webservices/axis2/trunk/java/modules/kernel/test-resources/j2secbuild.xml Sun Nov 26 06:41:47
2006
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<project basedir="." default="testsetup">
+   
+	<target name="testsetup">
+        <mkdir dir="${maven.build.dir}/test-resources/java2sec/more"/>        
+        <mkdir dir="${maven.build.dir}/test-resources/java2sec/less"/>        
+
+        <jar destfile="${maven.build.dir}/test-resources/java2sec/more/MorePermission.jar"
update="true">
+              <fileset dir="${maven.build.dir}/test-classes">
+                  <include name="org/apache/axis2/java/security/driver/*"/>
+                  <include name="org/apache/axis2/java/security/action/*"/>
+                  <include name="org/apache/axis2/java/security/interf/*"/>
+                  <include name="org/apache/axis2/java/security/more/*"/>
+              </fileset>
+        </jar>
+        
+        <delete dir="${maven.build.dir}/test-classes/org/apache/axis2/java/security/driver"
/>   
+        <delete dir="${maven.build.dir}/test-classes/org/apache/axis2/java/security/more"
/>
+        <delete dir="${maven.build.dir}/test-classes/org/apache/axis2/java/security/action"
/>
+        <delete dir="${maven.build.dir}/test-classes/org/apache/axis2/java/security/interf"
/>
+         
+        <jar destfile="${maven.build.dir}/test-resources/java2sec/less/LessPermission.jar"
update="true">
+              <fileset dir="${maven.build.dir}/test-classes">
+                  <include name="org/apache/axis2/java/security/less/*"/>
+              </fileset>
+        </jar>
+        
+        <delete dir="${maven.build.dir}/test-classes/org/apache/axis2/java/security/less"
/>
+
+    </target>
+</project>

Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?view=diff&rev=479367&r1=479366&r2=479367
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Sun Nov 26 06:41:47 2006
@@ -283,7 +283,22 @@
       <organization>Lanka Software Foundation / University of Moratuwa</organization>
     </contributor>
   </contributors>
-
+  
+  <repositories>
+    <repository>
+      <id>ws-zones</id>
+      <name>Apache WS project zone repo.</name>
+      <layout>legacy</layout>
+      <url>http://ws.zones.apache.org/repository</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+      	<enabled>true</enabled>
+      </releases>
+    </repository>
+  </repositories>
+  
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -403,9 +418,9 @@
         <version>2.2</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.woden</groupId>
+        <groupId>incubator-woden</groupId>
         <artifactId>woden</artifactId>
-        <version>1.0.0M6</version>
+        <version>SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>xmlunit</groupId>



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message