gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r983305 - in /gump/metadata/project: commons-jelly.xml msv.xml
Date Sat, 07 Aug 2010 20:15:30 GMT
Author: bodewig
Date: Sat Aug  7 20:15:30 2010
New Revision: 983305

URL: http://svn.apache.org/viewvc?rev=983305&view=rev
Log:
msv uses mvn now

Modified:
    gump/metadata/project/commons-jelly.xml
    gump/metadata/project/msv.xml

Modified: gump/metadata/project/commons-jelly.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/commons-jelly.xml?rev=983305&r1=983304&r2=983305&view=diff
==============================================================================
--- gump/metadata/project/commons-jelly.xml (original)
+++ gump/metadata/project/commons-jelly.xml Sat Aug  7 20:15:30 2010
@@ -1328,6 +1328,7 @@
       <property project="relaxng" name="maven.jar.relaxngDatatype" reference="jarpath"
/>
       <property project="xml-xerces" name="maven.jar.xerces" reference="jarpath" />
       <property project="commons-jexl-1.x" name="maven.jar.commons-jexl" reference="jarpath"
/>
+      <property project="msv-core" name="maven.jar.msv" reference="jarpath" />
     </maven>
 
     <depend project="commons-beanutils" />
@@ -1341,7 +1342,7 @@
     <depend project="iso-relax" />
     <depend project="jaxen" />
     <depend project="junit" />
-    <depend project="msv" />
+    <depend project="msv-core" />
     <depend project="relaxng" />
     <depend project="xml-apis" />
     <depend project="xml-xerces" />

Modified: gump/metadata/project/msv.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/msv.xml?rev=983305&r1=983304&r2=983305&view=diff
==============================================================================
--- gump/metadata/project/msv.xml (original)
+++ gump/metadata/project/msv.xml Sat Aug  7 20:15:30 2010
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module name="msv">
+<module name="msv" groupId="net.java.dev.msv">
 
   <url href="https://msv.dev.java.net/"/>
   <description>
@@ -24,7 +24,7 @@
 
   <svn repository="java.net-svn" dir="msv/trunk/"/>
 
-  <project name="xsdlib">
+  <project name="xsdlib" groupId="com.sun.msv.datatype.xsd">
     <package>com.sun.msv</package>
 
     <ant basedir="xsdlib" target="release"/>
@@ -37,27 +37,49 @@
     <jar name="xsdlib/dist/xsdlib.jar" id="xsdlib"/>
   </project>
 
-  <project name="msv">
+  <project name="msv-parent">
+    <pom name="parent/pom.xml"/>
+    <mvn2install basedir="parent"/>
+    <depend project="msv-pom"/>
+    <option project="ant"/>
+    <option project="jdom"/>
+    <option project="relaxng"/>
+    <option project="xalan"/>
+    <option project="xml-apis"/>
+    <option project="xml-resolver"/>
+    <option project="xml-xerces"/>
+  </project>
+
+  <project name="msv-pom">
+    <pom name="pom.xml" id="msv"/>
+    <mvn2install artifactId="msv"/>
+  </project>
+
+  <project name="msv-core">
     <package>com.sun.msv</package>
 
-    <ant basedir="msv" target="dist"/>
+    <mvn basedir="msv"/>
 
-    <depend project="ant"/>
-    <depend project="iso-relax"/>
-    <depend project="jakarta-servletapi-5-servlet"/>
-    <depend project="relaxng"/>
-    <depend project="xml-apis"/>
-    <depend project="xml-resolver"/>
-    <depend project="xml-xerces"/>
-    <depend project="xsdlib" inherit="jars"/>
+    <depend project="msv-parent"/>
+    <option project="iso-relax"/>
+    <option project="msv-testharness"/>
+    <option project="xml-apis"/>
+    <option project="xml-resolver"/>
+    <option project="xml-xerces"/>
+    <option project="xsdlib"/>
+    <jar name="msv/target/msv-core-*[0-9T].jar"/>
+  </project>
+
+  <project name="msv-testharness">
+    <package>com.sun.msv</package>
 
-    <!-- I'm afraid this is going to cause problems in non-clean
-         builds, in particular on Windows.  Let's try anyway since the
-         build process deletes the compiled classes and I can't seem
-         to find a workaround. -->
-    <work nested="msv/dist/msv.jar"/>
+    <mvn basedir="testharness"/>
 
-    <jar name="msv/dist/msv.jar" id="msv"/>
+    <depend project="msv-parent"/>
+    <option project="ant"/>
+    <option project="junit"/>
+    <option project="xml-xerces"/>
+    <jar name="testharness/target/msv-testharness-*[0-9T].jar"/>
   </project>
 
 </module>



Mime
View raw message