beehive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mm...@apache.org
Subject svn commit: r124132 - in incubator/beehive/trunk/wsm/drt: . tests/org/apache/beehive/wsm/jsr181/model tests/org/apache/beehive/wsm/jsr181/processor/apt webapp/WEB-INF/src/web
Date Tue, 04 Jan 2005 18:08:38 GMT
Author: mmerz
Date: Tue Jan  4 10:08:36 2005
New Revision: 124132

URL: http://svn.apache.org/viewcvs?view=rev&rev=124132
Log:
Renamed drt web service files to .jws; temporary fixes for apt.WsmAnnotationProcessor (more
fixes with compile-time validation check ins a bit later).


Added:
   incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar.jws
      - copied unchanged from r124116, incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar.java
   incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar2.jws
      - copied unchanged from r124116, incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar2.java
   incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar3.jws
      - copied unchanged from r124116, incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar3.java
   incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Foo.jws
      - copied unchanged from r124116, incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Foo.java
Removed:
   incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar.java
   incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar2.java
   incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar3.java
   incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Foo.java
Modified:
   incubator/beehive/trunk/wsm/drt/build.xml
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java

Modified: incubator/beehive/trunk/wsm/drt/build.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/build.xml?view=diff&rev=124132&p1=incubator/beehive/trunk/wsm/drt/build.xml&r1=124131&p2=incubator/beehive/trunk/wsm/drt/build.xml&r2=124132
==============================================================================
--- incubator/beehive/trunk/wsm/drt/build.xml	(original)
+++ incubator/beehive/trunk/wsm/drt/build.xml	Tue Jan  4 10:08:36 2005
@@ -5,13 +5,12 @@
     <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
 
     <property name="test.root" location="${basedir}"/>
+    <property name="drt.logs" location="${test.root}/logs"/>
     <property name="webapp.dir" location="${test.root}/webapp"/>
     <property name="tests.src" location="${test.root}/tests"/>
     <property name="build.dir" location="${test.root}/build"/>
     <property name="build.classes" location="${build.dir}/classes"/>
-    <property name="build.tests" location="${build.dir}/classes/tests"/>
-    <property name="build.jars" location="${build.dir}/jars"/>
-    <property name="drt.logs" location="${test.root}/logs"/>
+    <property name="build.tests" location="${build.classes}/tests"/>
     <condition property="drt.os" value="windows">
         <os family="windows"/>
     </condition>
@@ -76,18 +75,18 @@
         <echo message="--------------------------------------------------"/>
     </target>
     
-    <target name="build" depends="dirs,build-tests,build.webapp"/>
+    <target name="build" depends="dirs,build.tests,build.webapp"/>
     
-    <target name="clean" depends="clean-tests,clean.webapp" />
+    <target name="clean" depends="clean.tests,clean.webapp" />
     
     <target name="dirs">
         <mkdir dir="${build.classes}"/>
         <mkdir dir="${build.tests}"/>
-        <mkdir dir="${build.jars}"/>
+        <mkdir dir="${webapp.dir}/WEB-INF/temp"/>
         <mkdir dir="${drt.logs}"/>
     </target>
     
-    <target name="build-tests" depends="dirs,xbean">
+    <target name="build.tests" depends="dirs,xbean">
         <!-- Build the test source directory -->
         <javac srcdir="${tests.src}"
             destdir="${build.tests}"
@@ -102,14 +101,6 @@
         </copy>
     </target>
     
-    <target name="clean-tests">
-        <delete dir="${build.dir}"/>
-        <delete dir="${drt.logs}"/>
-        <delete>
-            <fileset dir="${tests.src}" includes="*.class"/>
-        </delete>
-    </target>
-    
     <target name="build.webapp">
         <ant target="deploy.wsm.webapp.runtime" dir="${os.BEEHIVE_HOME}/test/ant" antfile="buildWebapp.xml"
inheritAll="false">
             <property name="webapp.dir" value="${webapp.dir}"/>
@@ -119,6 +110,15 @@
         </ant>
     </target>
 
+    <target name="clean.tests">
+        <delete dir="${build.dir}"/>
+        <delete dir="${drt.logs}"/>
+        <delete>
+            <fileset dir="${tests.src}" includes="*.class"/>
+        </delete>
+        <delete dir="${webapp.dir}/WEB-INF/temp"/>
+    </target>
+    
     <target name="clean.webapp">
         <ant target="clean.webapp" dir="${os.BEEHIVE_HOME}/test/ant" antfile="buildWebapp.xml"
inheritAll="false">
             <property name="webapp.dir" value="${webapp.dir}"/>
@@ -155,32 +155,28 @@
             <batchtest filtertrace="off" todir="${drt.logs}">
                 <fileset dir="tests">
                     <include name="**/*Test.java"/>
-                    <!-- exclude name="**/util/**.class" / -->
-                    <!-- exclude name="**/AllTests.class" / -->
                 </fileset>
             </batchtest>
         </junit>
         <fail if="wsmdrtfailed" message="One or more tests in the WSM DRT failed." />
     </target>
-	
+    
+<!-- OBSOLETED - WILL BE REMOVED	
    <target name="single-test" depends="build">
         <junit failureproperty="wsmdrtfailed" printsummary="on" fork="yes">
             <classpath>
                 <pathelement location="${build.tests}"/>
-                <pathelement location="${build.tests}"/>
                 <path refid="drt.classpath"/>
             </classpath>
             <formatter type="plain"/>
             <batchtest filtertrace="off" todir="${drt.logs}">
                 <fileset dir="tests">
                     <include name="**/${testclass}.java"/>
-                    <!-- -Dtestclass=xxxxx  must be set in the command line -->
-                    <!-- exclude name="**/util/**.class" / -->
-                    <!-- exclude name="**/AllTests.class" / -->
+                    < -Dtestclass=xxxxx  must be set in the command line >
                 </fileset>
             </batchtest>
         </junit>
         <fail if="wsmdrtfailed" message="One or more tests in the WSM DRT failed." />
     </target>
-
+-->
 </project>

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java?view=diff&rev=124132&p1=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java&r1=124131&p2=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java&r2=124132
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java
(original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java
Tue Jan  4 10:08:36 2005
@@ -32,7 +32,7 @@
  */
 public class Bar2TestCase extends TestCase {
     protected static final String CLASSNAME = "web.Bar2";
-    protected static final String SRCFILENAME = "web/Bar2.java";
+    protected static final String SRCFILENAME = "web/Bar2.jws";
 
     protected AnnotationMetadata objectModel;
 

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java?view=diff&rev=124132&p1=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java&r1=124131&p2=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java&r2=124132
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java
(original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java
Tue Jan  4 10:08:36 2005
@@ -32,7 +32,7 @@
  */
 public class Bar3TestCase extends TestCase {
     protected static final String CLASSNAME = "web.Bar3";
-    protected static final String SRCFILENAME = "web/Bar3.java";
+    protected static final String SRCFILENAME = "web/Bar3.jws";
 
     protected AnnotationMetadata objectModel;
 

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java?view=diff&rev=124132&p1=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java&r1=124131&p2=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java&r2=124132
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java
(original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java
Tue Jan  4 10:08:36 2005
@@ -32,7 +32,7 @@
  */
 public class BarTestCase extends TestCase {
     protected static final String CLASSNAME = "web.Bar";
-    protected static final String[] SRCFILENAMES = {"web/Bar.java"};
+    protected static final String[] SRCFILENAMES = {"web/Bar.jws"};
 
     protected AnnotationMetadata objectModel;
 

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java?view=diff&rev=124132&p1=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java&r1=124131&p2=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java&r2=124132
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java
(original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java
Tue Jan  4 10:08:36 2005
@@ -29,7 +29,7 @@
  */
 public class FooTestCase extends TestCase {
     protected static final String CLASSNAME = "web.Foo";
-    protected static final String SRCFILENAME = "web/Foo.java";
+    protected static final String SRCFILENAME = "web/Foo.jws";
 
     protected AnnotationMetadata objectModel;
 

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java?view=diff&rev=124132&p1=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java&r1=124131&p2=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java&r2=124132
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java
(original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java
Tue Jan  4 10:08:36 2005
@@ -31,30 +31,12 @@
 
     @Override
     public void setUp() throws Exception {
-        // get project root from environment
-        String BEEHIVE_HOME;
-        if (null == (BEEHIVE_HOME = System.getenv("BEEHIVE_HOME"))) {
-            throw new Exception("BEEHIVE_HOME not set properly");
-        }
-        for (String srcFilename : java.util.Arrays.asList(SRCFILENAMES)) {
-            // initialize "command line args"
-            String[] _args = {
-                "-factory",
-                "org.apache.beehive.wsm.jsr181.processor.apt.WsmAnnotationProcessorFactory",
-                "-AsrcPath=" + new java.io.File(BEEHIVE_HOME, "/wsm/drt/webapp/WEB-INF/src").getCanonicalPath(),
-                new java.io.File(new java.io.File(BEEHIVE_HOME, "/wsm/drt/webapp/WEB-INF/src"),
-                        srcFilename).getCanonicalPath()
-            };
-
-            // compile source file
-            int status = new Main().compile(_args);
-            if (0 != status) {
-                throw new Exception("error compiling: " + SRCFILENAMES);
-            }
-        }
 
         // check if we have an object model
         objectModel = WsmReflectionAnnotationProcessor.getInstance().getObjectModel(Class.forName(CLASSNAME));
+        if (null == objectModel) {
+            throw new Exception ("No object model found.");
+        }
     }
 
     @Override

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java?view=diff&rev=124132&p1=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java&r1=124131&p2=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java&r2=124132
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java
(original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java
Tue Jan  4 10:08:36 2005
@@ -31,28 +31,13 @@
 
     @Override
     public void setUp() throws Exception {
-        // get project root from environment
-        String BEEHIVE_HOME;
-        if (null == (BEEHIVE_HOME = System.getenv("BEEHIVE_HOME"))) {
-            throw new Exception("BEEHIVE_HOME not set properly");
-        }
-
-        // initialize "command line args"
-        String[] _args = {
-            "-factory",
-            "org.apache.beehive.wsm.jsr181.processor.apt.WsmAnnotationProcessorFactory",
-            new java.io.File(new java.io.File(BEEHIVE_HOME, "/wsm/drt/webapp/WEB-INF/src"),
-                    SRCFILENAME).getCanonicalPath()
-        };
-
-        // compile source file
-        int status = new Main().compile(_args);
-        if (0 != status) {
-            throw new Exception("error compiling: " + SRCFILENAME);
-        }
 
         // check if we have an object model
         objectModel = WsmReflectionAnnotationProcessor.getInstance().getObjectModel(Class.forName(CLASSNAME));
+
+        if (null == objectModel) {
+            throw new Exception ("No object model found.");
+        }
     }
 
     @Override

Deleted: /incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar.java?view=auto&rev=124131
==============================================================================

Copied: incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar.jws (from r124116, incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar.jws?view=diff&rev=124132&p1=incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar.java&r1=124116&p2=incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar.jws&r2=124132
==============================================================================

Deleted: /incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar2.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar2.java?view=auto&rev=124131
==============================================================================

Copied: incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar2.jws (from r124116, incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar2.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar2.jws?view=diff&rev=124132&p1=incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar2.java&r1=124116&p2=incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar2.jws&r2=124132
==============================================================================

Deleted: /incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar3.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar3.java?view=auto&rev=124131
==============================================================================

Copied: incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar3.jws (from r124116, incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar3.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar3.jws?view=diff&rev=124132&p1=incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar3.java&r1=124116&p2=incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Bar3.jws&r2=124132
==============================================================================

Deleted: /incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Foo.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Foo.java?view=auto&rev=124131
==============================================================================

Copied: incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Foo.jws (from r124116, incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Foo.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Foo.jws?view=diff&rev=124132&p1=incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Foo.java&r1=124116&p2=incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/web/Foo.jws&r2=124132
==============================================================================

Mime
View raw message