You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jaxme-dev@ws.apache.org by jo...@apache.org on 2006/07/28 10:08:44 UTC

svn commit: r426426 - in /webservices/jaxme/branches/b0_5: ./ ant/ prerequisites/ src/pm/org/apache/ws/jaxme/pm/ino/api4j/

Author: jochen
Date: Fri Jul 28 01:08:43 2006
New Revision: 426426

URL: http://svn.apache.org/viewvc?rev=426426&view=rev
Log:
Project wasn't building with java 1.4 anymore.

Added:
    webservices/jaxme/branches/b0_5/prerequisites/xml-apis-1.3.02.jar   (with props)
Removed:
    webservices/jaxme/branches/b0_5/prerequisites/xml-apis.jar
Modified:
    webservices/jaxme/branches/b0_5/.classpath
    webservices/jaxme/branches/b0_5/ant/api.xml
    webservices/jaxme/branches/b0_5/ant/jm.xml
    webservices/jaxme/branches/b0_5/ant/js.xml
    webservices/jaxme/branches/b0_5/ant/pm.xml
    webservices/jaxme/branches/b0_5/ant/xs.xml
    webservices/jaxme/branches/b0_5/build.xml
    webservices/jaxme/branches/b0_5/prerequisites/README
    webservices/jaxme/branches/b0_5/src/pm/org/apache/ws/jaxme/pm/ino/api4j/TaminoAPI4JPm.java

Modified: webservices/jaxme/branches/b0_5/.classpath
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/.classpath?rev=426426&r1=426425&r2=426426&view=diff
==============================================================================
--- webservices/jaxme/branches/b0_5/.classpath (original)
+++ webservices/jaxme/branches/b0_5/.classpath Fri Jul 28 01:08:43 2006
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/api"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/js"/>
-	<classpathentry kind="src" path="src/xs"/>
-	<classpathentry kind="src" path="src/jaxme"/>
-	<classpathentry excluding="org/apache/ws/jaxme/generator/ino/api4j/|org/apache/ws/jaxme/pm/ino/api4j/" kind="src" path="src/pm"/>
-	<classpathentry kind="src" path="build/js/src"/>
-	<classpathentry kind="src" path="build/jm/src"/>
-	<classpathentry kind="src" path="build/jm/test/jaxme/src"/>
-	<classpathentry kind="src" path="build/pm/test/src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="lib" path="prerequisites/xml-apis.jar"/>
-	<classpathentry exported="true" kind="lib" path="prerequisites/junit.jar"/>
-	<classpathentry exported="true" kind="lib" path="prerequisites/ant-1.5.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="prerequisites/log4j-1.2.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="prerequisites/xmldb-api-20021118.jar"/>
-	<classpathentry kind="src" path="src/webapp/java"/>
-	<classpathentry exported="true" kind="lib" path="prerequisites/servlet.jar"/>
-	<classpathentry exported="true" kind="lib" path="prerequisites/antlr.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK-1.4.2" kind="con"/>
+	<classpathentry path="src/api" output="build/api/classes" kind="src"/>
+	<classpathentry path="src/test/java" output="build/jm/classes" kind="src"/>
+	<classpathentry path="src/js" output="build/js/classes" kind="src"/>
+	<classpathentry path="src/xs" output="build/xs/classes" kind="src"/>
+	<classpathentry path="src/jaxme" output="build/jm/classes" kind="src"/>
+	<classpathentry excluding="org/apache/ws/jaxme/generator/ino/api4j/|org/apache/ws/jaxme/pm/ino/api4j/" path="src/pm" output="build/pm/classes" kind="src"/>
+	<classpathentry path="build/js/src" output="build/js/classes" kind="src"/>
+	<classpathentry path="build/jm/src" output="build/jm/classes" kind="src"/>
+	<classpathentry path="build/jm/test/jaxme/src" output="build/jm/classes" kind="src"/>
+	<classpathentry path="build/pm/test/src" output="build/pm/classes" kind="src"/>
+	<classpathentry path="prerequisites/xml-apis-1.3.02.jar" exported="true" kind="lib"/>
+	<classpathentry path="prerequisites/junit.jar" exported="true" kind="lib"/>
+	<classpathentry path="prerequisites/ant-1.5.4.jar" exported="true" kind="lib"/>
+	<classpathentry path="prerequisites/log4j-1.2.8.jar" exported="true" kind="lib"/>
+	<classpathentry path="prerequisites/xmldb-api-20021118.jar" exported="true" kind="lib"/>
+	<classpathentry path="src/webapp/java" output="build/webapp/classes" kind="src"/>
+	<classpathentry path="prerequisites/servlet.jar" exported="true" kind="lib"/>
+	<classpathentry path="prerequisites/antlr.jar" exported="true" kind="lib"/>
+	<classpathentry path="build/jm/classes" kind="output"/>
 </classpath>

Modified: webservices/jaxme/branches/b0_5/ant/api.xml
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/ant/api.xml?rev=426426&r1=426425&r2=426426&view=diff
==============================================================================
--- webservices/jaxme/branches/b0_5/ant/api.xml (original)
+++ webservices/jaxme/branches/b0_5/ant/api.xml Fri Jul 28 01:08:43 2006
@@ -25,7 +25,7 @@
     </target>
    
     <path id="api.class.path">
-        <pathelement location="${preqs}/xml-apis.jar"/>
+        <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
     </path>
 
     <target name="API.compile" depends="init">

Modified: webservices/jaxme/branches/b0_5/ant/jm.xml
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/ant/jm.xml?rev=426426&r1=426425&r2=426426&view=diff
==============================================================================
--- webservices/jaxme/branches/b0_5/ant/jm.xml (original)
+++ webservices/jaxme/branches/b0_5/ant/jm.xml Fri Jul 28 01:08:43 2006
@@ -34,7 +34,7 @@
       <pathelement location="${dist}/jaxmejs-${version}.jar"/>
       <pathelement location="${dist}/jaxmexs-${version}.jar"/>
       <pathelement location="${preqs}/ant.jar"/>
-      <pathelement location="${preqs}/xml-apis.jar"/>
+      <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
       <pathelement location="${preqs}/beaver.jar"/>
       <pathelement location="${preqs}/antlr.jar"/>
     </path>

Modified: webservices/jaxme/branches/b0_5/ant/js.xml
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/ant/js.xml?rev=426426&r1=426425&r2=426426&view=diff
==============================================================================
--- webservices/jaxme/branches/b0_5/ant/js.xml (original)
+++ webservices/jaxme/branches/b0_5/ant/js.xml Fri Jul 28 01:08:43 2006
@@ -17,6 +17,7 @@
 -->
 <project name="JS" default="all">
     <import file="clover.xml"/>
+	<import file="api.xml"/>
 
     <property name="build.js" location="${build}/js"/>
     <property name="build.js.src" location="${build.js}/src"/>
@@ -38,6 +39,7 @@
       <pathelement location="${preqs}/ant-1.5.4.jar"/>
       <pathelement location="${preqs}/junit.jar"/>
       <pathelement location="${preqs}/antlr.jar"/>
+      <pathelement location="${dist}/jaxmeapi-${version}.jar"/>
     </path>
 
     <path id="js.test.path">
@@ -163,7 +165,7 @@
         </javac>
     </target>
 
-    <target name="JS.generate" depends="JS.generate.compile"/>
+    <target name="JS.generate" depends="API.all,JS.generate.compile"/>
 
     <target name="all" depends="JS.generate"/>
 

Modified: webservices/jaxme/branches/b0_5/ant/pm.xml
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/ant/pm.xml?rev=426426&r1=426425&r2=426426&view=diff
==============================================================================
--- webservices/jaxme/branches/b0_5/ant/pm.xml (original)
+++ webservices/jaxme/branches/b0_5/ant/pm.xml Fri Jul 28 01:08:43 2006
@@ -39,7 +39,7 @@
         <pathelement location="${preqs}/beaver.jar"/>   
         <pathelement location="${preqs}/hsqldb-1.7.1.jar"/>
         <pathelement location="${preqs}/ant.jar"/>
-        <pathelement location="${preqs}/xml-apis.jar"/>
+        <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
         <pathelement location="${preqs}/xercesImpl.jar"/>
         <pathelement location="${preqs}/xmldb-api-20021118.jar"/>
         <!-- These aren't in the CVS and aren't necessary for the build -->

Modified: webservices/jaxme/branches/b0_5/ant/xs.xml
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/ant/xs.xml?rev=426426&r1=426425&r2=426426&view=diff
==============================================================================
--- webservices/jaxme/branches/b0_5/ant/xs.xml (original)
+++ webservices/jaxme/branches/b0_5/ant/xs.xml Fri Jul 28 01:08:43 2006
@@ -23,7 +23,7 @@
     <property name="src.xs" location="${basedir}/src/xs"/>
 
     <path id="xs.class.path">
-        <pathelement location="${preqs}/xml-apis.jar"/>
+        <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
         <pathelement location="${preqs}/junit.jar"/>
         <pathelement location="${dist}/jaxmeapi-${version}.jar"/>
     </path>

Modified: webservices/jaxme/branches/b0_5/build.xml
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/build.xml?rev=426426&r1=426425&r2=426426&view=diff
==============================================================================
--- webservices/jaxme/branches/b0_5/build.xml (original)
+++ webservices/jaxme/branches/b0_5/build.xml Fri Jul 28 01:08:43 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
 -->
 <project name="JaxMe" default="all">
-    <property name="version" value="0.5.1"/>
+    <property name="version" value="0.5.2-SNAPSHOT"/>
     <property name="debug" value="true"/>
     <property name="optimize" value="false"/>   
 
@@ -34,7 +34,7 @@
                <include name="prerequisites/junit*.jar"/>
                <include name="prerequisites/log4j*.jar"/>
                <include name="prerequisites/xercesImpl.jar"/>
-               <include name="prerequisites/xml-apis.jar"/>
+               <include name="prerequisites/xml-apis-1.3.02.jar"/>
                <include name="prerequisites/xmldb-api-*.jar"/>
 	       </tarfileset>
 	       <tarfileset prefix="ws-jaxme-${version}/docs" dir="${build.site}"/>

Modified: webservices/jaxme/branches/b0_5/prerequisites/README
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/prerequisites/README?rev=426426&r1=426425&r2=426426&view=diff
==============================================================================
Binary files - no diff available.

Added: webservices/jaxme/branches/b0_5/prerequisites/xml-apis-1.3.02.jar
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/prerequisites/xml-apis-1.3.02.jar?rev=426426&view=auto
==============================================================================
Binary file - no diff available.

Propchange: webservices/jaxme/branches/b0_5/prerequisites/xml-apis-1.3.02.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: webservices/jaxme/branches/b0_5/src/pm/org/apache/ws/jaxme/pm/ino/api4j/TaminoAPI4JPm.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/src/pm/org/apache/ws/jaxme/pm/ino/api4j/TaminoAPI4JPm.java?rev=426426&r1=426425&r2=426426&view=diff
==============================================================================
--- webservices/jaxme/branches/b0_5/src/pm/org/apache/ws/jaxme/pm/ino/api4j/TaminoAPI4JPm.java (original)
+++ webservices/jaxme/branches/b0_5/src/pm/org/apache/ws/jaxme/pm/ino/api4j/TaminoAPI4JPm.java Fri Jul 28 01:08:43 2006
@@ -110,6 +110,7 @@
             pQuery = super.parseQuery(pQuery, pParams);
         }
 
+        TConnection conn = null;
         try {
         	JAXBContextImpl c = getManager().getFactory();
             setJAXBContext(c);



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