axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sc...@apache.org
Subject svn commit: r448069 - in /webservices/axis2/trunk/java: etc/ modules/kernel/ modules/kernel/src/org/apache/axis2/java/ modules/kernel/test-resources/java2sec/ modules/kernel/test/org/apache/axis2/java/
Date Wed, 20 Sep 2006 05:10:42 GMT
Author: scheu
Date: Tue Sep 19 22:10:41 2006
New Revision: 448069

URL: http://svn.apache.org/viewvc?view=rev&rev=448069
Log:
AXIS2-1110 backed out due to build failures

Removed:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/java/
    webservices/axis2/trunk/java/modules/kernel/test-resources/java2sec/
    webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/
Modified:
    webservices/axis2/trunk/java/etc/project.properties
    webservices/axis2/trunk/java/modules/kernel/maven.xml
    webservices/axis2/trunk/java/modules/kernel/project.properties
    webservices/axis2/trunk/java/modules/kernel/project.xml

Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/etc/project.properties?view=diff&rev=448069&r1=448068&r2=448069
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Tue Sep 19 22:10:41 2006
@@ -111,7 +111,6 @@
 jibx.version=SNAPSHOT
 junit.version=3.8.2
 maven.itest.plugin.version=1.0
-maven.test.plugin.version=1.8
 opensaml.version=1.1
 neethi.version=SNAPSHOT
 servletapi.version=2.3

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=448069&r1=448068&r2=448069
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/maven.xml Tue Sep 19 22:10:41 2006
@@ -8,12 +8,6 @@
     xmlns:maven="jelly:maven"
     xmlns:deploy="deploy"
     xmlns:ant="jelly:ant">
-    
-    <goal name="java2sec:copy">
-        <mkdir dir="${basedir}/test-resources/java2sec/test/classes"/>        
-        <copy toFile="${basedir}/test-resources/java2sec/test/classes/org/apache/axis2/java/security/less/LessPermission.class"
file="${basedir}/target/test-classes/org/apache/axis2/java/security/less/LessPermission.class"/>
-     </goal>   
-     
     <postGoal name="test:compile">
       <j:if test="${context.getVariable('maven.test.skip') != 'true'}">
         <j:jelly xmlns="jelly:ant">
@@ -26,31 +20,6 @@
         </j:jelly>
         <ant:copy file="${basedir}/test-resources/deployment/axis2.xml" tofile="${basedir}/target/test-resources/deployment/axis2.xml"/>
       </j:if>
-      <mkdir dir="${basedir}/target/test-resources/Java2Sec/more"/>        
-      <mkdir dir="${basedir}/target/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/dirver"
/>   
-      <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}"/>

Modified: webservices/axis2/trunk/java/modules/kernel/project.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/project.properties?view=diff&rev=448069&r1=448068&r2=448069
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/project.properties (original)
+++ webservices/axis2/trunk/java/modules/kernel/project.properties Tue Sep 19 22:10:41 2006
@@ -16,13 +16,3 @@
 
 maven.multiproject.type=jar
 
-# These properties are used by Java 2 Security testcase 
-maven.test.classpath=${maven.build.dir}/test-resources/Java2Sec/less/LessPermission.jar;${maven.build.dir}/test-resources/Java2Sec/more/MorePermission.jar
-maven.junit.jvmargs=-Djava.security.policy=${base_dir}/test-resources/java2sec/policy/java2sectest.policy
-maven.junit.sysproperties=maven_home_dir base_dir maven_build_dir maven_repo_local maven_installed_root
maven_test_dest
-maven_installed_root=${maven.home}
-base_dir=${basedir}
-maven_build_dir=${maven.build.dir}
-maven_test_dest=${maven.test.dest}
-maven_repo_local=${maven.repo.local}
-

Modified: webservices/axis2/trunk/java/modules/kernel/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/project.xml?view=diff&rev=448069&r1=448068&r2=448069
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/project.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/project.xml Tue Sep 19 22:10:41 2006
@@ -44,12 +44,6 @@
 
 
         <!-- external JARs -->
-        <dependency>
-          <groupId>maven</groupId>
-          <artifactId>maven-test-plugin</artifactId>
-          <type>plugin</type>
-          <version>${maven.test.plugin.version}</version>
-       </dependency>
         
         <dependency>
             <groupId>commons-logging</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