You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-dev@ws.apache.org by ip...@apache.org on 2005/05/04 21:59:55 UTC

svn commit: r168181 - in /incubator/muse/trunk: project.xml wsdm-xbeans/maven.xml wsdm-xbeans/project.xml

Author: ips
Date: Wed May  4 12:59:55 2005
New Revision: 168181

URL: http://svn.apache.org/viewcvs?rev=168181&view=rev
Log:
updated to get jsr173 jar from ibiblio repo

Modified:
    incubator/muse/trunk/project.xml
    incubator/muse/trunk/wsdm-xbeans/maven.xml
    incubator/muse/trunk/wsdm-xbeans/project.xml

Modified: incubator/muse/trunk/project.xml
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/project.xml?rev=168181&r1=168180&r2=168181&view=diff
==============================================================================
--- incubator/muse/trunk/project.xml (original)
+++ incubator/muse/trunk/project.xml Wed May  4 12:59:55 2005
@@ -107,63 +107,63 @@
     </dependency>
 
     <dependency>
-      <groupId>commonj</groupId>
-      <artifactId>commonj-twm</artifactId>
-      <version>1.0</version>
+      <groupId>apollo</groupId>
+      <artifactId>commonj-twm-api</artifactId>
+      <version>1.1</version>
       <url>http://dev2dev.bea.com/technologies/commonj/twm/</url>
       <properties>
-        <license>CommonjTwmLicense.txt</license>
-        <usage>Needed for timer apis.</usage>
+        <license>ApacheLicense-2.0.txt</license>
+        <usage>Timer APIs used for scheduled resource termination</usage>
         <war.bundle>true</war.bundle>
       </properties>
-    </dependency>    
-    
+    </dependency>
+        
     <dependency>
-    <groupId>apollo</groupId>
-    <artifactId>apollo-incubating</artifactId>
-    <version>1.0-alpha3-SNAPSHOT</version>    
-    <url>http://incubator.apache.org/apollo/</url>
-    <properties>
+      <groupId>apollo</groupId>
+      <artifactId>apollo-incubating</artifactId>
+      <version>1.0-alpha3-SNAPSHOT</version>    
+      <url>http://incubator.apache.org/apollo/</url>
+      <properties>
 	<license>ApacheLicense-2.0.txt</license>
 	<usage>WSRF impl</usage>
 	<war.bundle>true</war.bundle>
-    </properties>
+      </properties>
     </dependency>
 
     <dependency>
-    <groupId>apollo</groupId>
-    <artifactId>wsa-xbeans</artifactId>
-    <version>SNAPSHOT</version>
-    <url>http://incubator.apache.org/apollo/</url>
-    <properties>
+      <groupId>apollo</groupId>
+      <artifactId>wsa-xbeans</artifactId>
+      <version>SNAPSHOT</version>
+      <url>http://incubator.apache.org/apollo/</url>
+      <properties>
 	<license>ApacheLicense-2.0.txt</license>
 	<usage>Needed for handling requests. This contains the XmlBeans-generated code from the WSA XSDs. This "could" be eliminated and generated on the fly, but it would make the builds longer.</usage>
 	<war.bundle>true</war.bundle>
-    </properties>
+      </properties>
     </dependency>
 
     <dependency>
-    <groupId>apollo</groupId>
-    <artifactId>wsrf-xbeans</artifactId>
-    <version>SNAPSHOT</version>
-    <url>http://incubator.apache.org/apollo/</url>
-    <properties>
+      <groupId>apollo</groupId>
+      <artifactId>wsrf-xbeans</artifactId>
+      <version>SNAPSHOT</version>
+      <url>http://incubator.apache.org/apollo/</url>
+      <properties>
 	<license>ApacheLicense-2.0.txt</license>
 	<usage>Needed for handling requests. This contains the XmlBeans-generated code from the WSRF WSDLs/XSDs. This "could" be eliminated and generated on the fly, but it would make the builds longer.</usage>
 	<war.bundle>true</war.bundle>
-    </properties>
+       </properties>
     </dependency>
     
     <dependency>
-    <groupId>log4j</groupId>
-    <artifactId>log4j</artifactId>
-    <version>1.2.8</version>
-    <url>http://logging.apache.org/log4j/</url>
-    <properties>
-    <license>ApacheLicense-2.0.txt</license>
-    <war.bundle>true</war.bundle>
-    <usage>Needed by Velocity.</usage>
-    </properties>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.8</version>
+      <url>http://logging.apache.org/log4j/</url>
+      <properties>
+        <license>ApacheLicense-2.0.txt</license>
+        <war.bundle>true</war.bundle>
+        <usage>Needed by Velocity.</usage>
+      </properties>
     </dependency>
     
     <dependency>
@@ -179,15 +179,15 @@
     </dependency>
 
     <dependency>
-    <groupId>apollo</groupId>
-    <artifactId>apollo-jndi-config</artifactId>
-    <version>SNAPSHOT</version>
-    <url>http://incubator.apache.org/apollo/</url>
-    <properties>
+      <groupId>apollo</groupId>
+      <artifactId>apollo-jndi-config</artifactId>
+      <version>SNAPSHOT</version>
+      <url>http://incubator.apache.org/apollo/</url>
+      <properties>
 	<license>ApacheLicense-2.0.txt</license>
 	<war.bundle>true</war.bundle>
 	<usage>Needed for handling our JNDI XML config file via XmlBeans. This "could" be removed, but then we'd probably replace it with commons-config.  The reason we avoided that approach is that we leveredge XmlBeans extensively in our codebase.</usage>
-    </properties>
+      </properties>
     </dependency>
     
     <dependency>
@@ -480,7 +480,7 @@
         <usage>Needed for XSL and report generation.</usage>
       </properties>
     </dependency>
-    
+<!--    
     <dependency>
       <groupId>xmlbeans</groupId>
       <artifactId>xbean</artifactId>
@@ -492,19 +492,31 @@
         <usage>Needed for handling XML types in a platform agnostic way.</usage>
       </properties>
     </dependency>
-    
+-->        
     <dependency>
       <groupId>xmlbeans</groupId>
-      <artifactId>xbean_xpath</artifactId>
-      <version>1.0.4</version>
+      <artifactId>xbean</artifactId>
+      <version>2.0.0-beta1</version>
       <url>http://xmlbeans.apache.org/</url>
       <properties>
         <license>ApacheLicense-2.0.txt</license>
         <war.bundle>true</war.bundle>
-        <usage>XMLBeans - used throughout code base.</usage>
+        <usage>Needed for handling XML types in a platform agnostic way.</usage>
       </properties>
     </dependency>
-    
+
+    <dependency>
+      <groupId>xmlbeans</groupId>
+      <artifactId>xmlbeans-jsr173-api</artifactId>
+      <version>2.0-dev</version>
+      <url>http://xmlbeans.apache.org/</url>
+      <properties>
+        <license>ApacheLicense-2.0.txt</license>
+        <war.bundle>true</war.bundle>
+        <usage>Needed for handling XML types in a platform agnostic way.</usage>
+      </properties>
+    </dependency>       
+
   </dependencies>
 
   <build>

Modified: incubator/muse/trunk/wsdm-xbeans/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/wsdm-xbeans/maven.xml?rev=168181&r1=168180&r2=168181&view=diff
==============================================================================
--- incubator/muse/trunk/wsdm-xbeans/maven.xml (original)
+++ incubator/muse/trunk/wsdm-xbeans/maven.xml Wed May  4 12:59:55 2005
@@ -19,44 +19,56 @@
   </postGoal>  
 
   <goal name="generate"
-        description="generate XmlBeans for WSDM spec types">
+        description="generate XMLBeans for WSDM spec types">
     
-      <taskdef name="schemaCompiler"
-               classname="org.apache.xmlbeans.impl.tool.XMLBean"
-               classpathref="maven.dependency.classpath" />    
-
-      <j:set var="gen.src.dir" value="${maven.src.dir}/java"/>
+      <property name="gen.src.dir" location="${maven.src.dir}/java" />
       <echo>Writing generated XMLBeans source files to: ${gen.src.dir}</echo>
       <delete dir="${gen.src.dir}"/>
       <mkdir dir="${gen.src.dir}"/>
 
-      <j:set var="gen.classes.dir" value="${maven.build.dest}"/>
+      <property name="gen.classes.dir" location="${maven.build.dest}" />
       <echo>Writing generated XMLBeans classes to: ${gen.classes.dir}</echo>
       <delete dir="${gen.classes.dir}"/>
       <mkdir dir="${gen.classes.dir}"/>
 
-      <schemaCompiler
-         classpathref="maven.dependency.classpath"
-         srcgendir="${gen.src.dir}"
-         classgendir="${gen.classes.dir}"
-         download="on"
-         verbose="on"
-         quiet="off"
-         optimize="off"
-         debug="on"
-         debugLevel="lines,vars,source"
-         fork="off"
-         ignoreDuplicatesInNamespaces=""
-         includeAntRuntime="on"
-         includeJavaRuntime="off"
-         memoryInitialSize="32M"
-         memoryMaximumSize="192M"
-         failonerror="on">
+      <pathconvert refid="maven.dependency.classpath" dirsep="/" property="cp.value" />
+      
+      <!-- NOTE: fork must be enabled to circumvent XMLBeans/Maven bug! -->
+      <java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler" 
+            classpathref="maven.dependency.classpath" 
+            verbose="true" 
+            fork="true"
+            maxmemory="256M">         
+         <arg value="-cp" />
+         <arg value="${cp.value}" />
+         <!--<arg value="-debug" />-->
+         <arg value="-dl" />
+         <arg value="-d" />
+         <arg value="${gen.classes.dir}" />
+         <arg value="-src" />
+         <arg value="${gen.src.dir}" />
+         <arg value="-verbose" />
+         <arg line="${maven.src.dir}/wsdl" />
+      </java>
+
+<!--
+      <taskdef name="schemaCompiler"
+               classname="org.apache.xmlbeans.impl.tool.XMLBean"
+               classpathref="maven.dependency.classpath" />    
+
+      <schemaCompiler classpathref="maven.dependency.classpath"
+                      srcgendir="${gen.src.dir}"
+                      classgendir="${gen.classes.dir}"
+                      download="on"
+                      verbose="on"
+                      debug="on"
+                      debugLevel="lines,vars,source"
+                      failonerror="on">
          
-        <fileset dir="${maven.src.dir}/wsdl/wsdm" />
+         <fileset dir="${maven.src.dir}/wsdl" />
         
       </schemaCompiler>
-
+-->
   </goal>
   
   <goal name="src-jar">

Modified: incubator/muse/trunk/wsdm-xbeans/project.xml
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/wsdm-xbeans/project.xml?rev=168181&r1=168180&r2=168181&view=diff
==============================================================================
--- incubator/muse/trunk/wsdm-xbeans/project.xml (original)
+++ incubator/muse/trunk/wsdm-xbeans/project.xml Wed May  4 12:59:55 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<!-- WSDM Spec XMLBeans - defines Project Object Model (POM) -->
+<!-- WSDM Spec XMLBeans - Project Object Model (POM) -->
 
 <!-- Schema for this file is at:    http://maven.apache.org/xsd/maven-project-3.0.0.xsd -->
 <!-- Reference for this file is at: http://maven.apache.org/reference/project-descriptor.html -->
@@ -50,29 +50,29 @@
   <dependencies>
 
     <dependency>
-      <groupId>apollo</groupId>
-      <artifactId>wsa-xbeans</artifactId>
-      <version>SNAPSHOT</version>
-      <url>http://incubator.apache.org/apollo/</url>
+      <groupId>xmlbeans</groupId>
+      <artifactId>xbean</artifactId>
+      <version>2.0.0-beta1</version>
+      <url>http://xmlbeans.apache.org/</url>
       <properties>
         <license>ApacheLicense-2.0.txt</license>
-        <usage>XMLBeans for WSA spec types</usage>
         <war.bundle>true</war.bundle>
+        <usage>Needed for handling XML types in a platform agnostic way.</usage>
       </properties>
     </dependency>
 
     <dependency>
-      <groupId>apollo</groupId>
-      <artifactId>wsrf-xbeans</artifactId>
-      <version>SNAPSHOT</version>
-      <url>http://incubator.apache.org/apollo/</url>
+      <groupId>xmlbeans</groupId>
+      <artifactId>xmlbeans-jsr173-api</artifactId>
+      <version>2.0-dev</version>
+      <url>http://xmlbeans.apache.org/</url>
       <properties>
         <license>ApacheLicense-2.0.txt</license>
-        <usage>XMLBeans for WSRF spec types</usage>
         <war.bundle>true</war.bundle>
+        <usage>Needed for handling XML types in a platform agnostic way.</usage>
       </properties>
-    </dependency>
-    
+    </dependency>       
+<!--    
     <dependency>
       <groupId>xmlbeans</groupId>
       <artifactId>xbean</artifactId>
@@ -84,7 +84,31 @@
         <usage>Used to generate XMLBeans</usage>
       </properties>
     </dependency>        
-    
+-->    
+    <dependency>
+      <groupId>apollo</groupId>
+      <artifactId>wsa-xbeans</artifactId>
+      <version>SNAPSHOT</version>
+      <url>http://incubator.apache.org/apollo/</url>
+      <properties>
+        <license>ApacheLicense-2.0.txt</license>
+        <usage>XMLBeans for WSA spec types</usage>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>apollo</groupId>
+      <artifactId>wsrf-xbeans</artifactId>
+      <version>SNAPSHOT</version>
+      <url>http://incubator.apache.org/apollo/</url>
+      <properties>
+        <license>ApacheLicense-2.0.txt</license>
+        <usage>XMLBeans for WSRF spec types</usage>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
   </dependencies>
 
 </project>



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