Author: mac
Date: Mon Aug 22 01:46:26 2005
New Revision: 234455
URL: http://svn.apache.org/viewcvs?rev=234455&view=rev
Log:
Execute goal build for the top level project.
Corrected groupId from the subprojects and created maven.xml on the top-level
project.
Changed inheritance for the top-level project. We can always revert.
Added:
webservices/jaxme/branches/MAVEN/maven.xml
Modified:
webservices/jaxme/branches/MAVEN/common-build/maven.xml
webservices/jaxme/branches/MAVEN/project.properties
webservices/jaxme/branches/MAVEN/project.xml
webservices/jaxme/branches/MAVEN/projects/api/project.xml
webservices/jaxme/branches/MAVEN/projects/jm/project.xml
webservices/jaxme/branches/MAVEN/projects/js/project.xml
webservices/jaxme/branches/MAVEN/projects/xs/project.xml
Modified: webservices/jaxme/branches/MAVEN/common-build/maven.xml
URL:
http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/common-build/maven.xml?rev=234455&r1=234454&r2=234455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/common-build/maven.xml (original)
+++ webservices/jaxme/branches/MAVEN/common-build/maven.xml Mon Aug 22 01:46:26
2005
@@ -1,4 +1,21 @@
<?xml version="1.0"?>
+<!--
+
+ Copyright 2004 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<project
xmlns:ant="jelly:ant"
xmlns:artifact="artifact">
Added: webservices/jaxme/branches/MAVEN/maven.xml
URL:
http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/maven.xml?rev=234455&view=auto
==============================================================================
--- webservices/jaxme/branches/MAVEN/maven.xml (added)
+++ webservices/jaxme/branches/MAVEN/maven.xml Mon Aug 22 01:46:26 2005
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!--
+
+ Copyright 2004 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project
+ xmlns:j="jelly:core"
+ xmlns:maven="jelly:maven"
+ xmlns:ant="jelly:ant">
+
+<goal name="build">
+
+<ant:echo>Deleting ${maven.build.dir}</ant:echo>
+<ant:delete dir="${maven.build.dir}"/>
+
+
+<echo>Gathering project list</echo>
+
+<maven:reactor
+basedir="${basedir}"
+ includes="${maven.multiproject.includes}"
+ excludes=""
+ banner="Building"
+ ignoreFailures="false"
+ collectOnly="true"
+ collectionVar="multiprojects"
+/>
+
+<echo>Now building reactor projects: ${multiprojects}</echo>
+
+<maven:reactor
+ basedir="${basedir}"
+ banner="Running [${maven.multiproject.site.goals}] for project "
+ projectList="${multiprojects}"
+ goals="${maven.multiproject.site.goals}"
+ ignoreFailures="${maven.multiproject.ignoreFailures}"
+/>
+<echo>Now copying reactor projects: ${multiprojects}</echo>
+ <!-- copy each project over into ${maven.docs.dest} -->
+ <j:forEach var="reactorProject" items="${multiprojects}">
+ <!-- note this is the same name as is generated in the
navigation-aggregate.xml -->
+ <j:set var="directory"
value="${maven.docs.dest}/${maven.multiproject.aggregateDir}${reactorProject.artifactId}"/>
+ <mkdir dir="${directory}"/>
+ <!--
+ ${reactorProject.name} has docs directory
+ ${reactorProject.context.getVariable('maven.docs.dest')}
+ needing to be copied
+ -->
+ <j:set var="fromDir"
+ value="${reactorProject.context.getVariable('maven.docs.dest')}"/>
+ <mkdir dir="${fromDir}"/>
+ <copy toDir="${directory}">
+ <fileset dir="${fromDir}"/>
+ </copy>
+ </j:forEach>
+<echo>Now creating top-level project</echo>
+ <attainGoal name="multiproject:create-nav"/>
+ <attainGoal name="multiproject:create-overview-page"/>
+ <attainGoal name="site" />
+</goal>
+
+</project>
\ No newline at end of file
Modified: webservices/jaxme/branches/MAVEN/project.properties
URL:
http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/project.properties?rev=234455&r1=234454&r2=234455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/project.properties (original)
+++ webservices/jaxme/branches/MAVEN/project.properties Mon Aug 22 01:46:26 2005
@@ -17,10 +17,14 @@
maven.xdoc.date=left
maven.subprojects.pom=projects/api/project.xml,projects/xs/project.xml,projects/js/project.xml,projects/jm/project.xml
-maven.multiproject.aggregateDir=projects/
maven.multiproject.includes=projects/api/project.xml,projects/xs/project.xml,projects/js/project.xml,projects/jm/project.xml
+maven.multiproject.aggregateDir=projects/
maven.multiproject.navigation=aggregate
maven.multiproject.site.goals=clean,jar:install,site
+
+#no docs for the top-level project for the moment
+maven.docs.src=nill
+
maven.linkcheck.exclude=projects
Modified: webservices/jaxme/branches/MAVEN/project.xml
URL:
http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/project.xml?rev=234455&r1=234454&r2=234455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/project.xml (original)
+++ webservices/jaxme/branches/MAVEN/project.xml Mon Aug 22 01:46:26 2005
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2004 The Apache Software Foundation.
@@ -15,36 +15,38 @@
See the License for the specific language governing permissions and
limitations under the License.
--->
-<project>
- <extend>common-build/project.xml</extend>
- <id>jaxme:JaxMeAll</id>
- <artifactId>jaxme:JaxMeAll</artifactId>
- <organization />
- <description>A Java/XML binding compiler takes as input a schema
description (in most cases an XML schema but it may be a DTD, a RelaxNG schema,
a Java class inspected via reflection or a database schema). The output is a
set of Java classes:
-
- * A Java bean class compatible with the schema description. (If the schema
was obtained via Java reflection, then the original Java bean class.)
- * An unmarshaller that converts a conforming XML document into the
equivalent Java bean.
- * Vice versa, a marshaller that converts the Java bean back into the
original XML document.
-A Java/XML binding compiler takes as input a schema description (in most cases
an XML schema but it may be a DTD, a RelaxNG schema, a Java class inspected via
reflection or a database schema). The output is a set of Java classes:
-
- * A Java bean class compatible with the schema description. (If the schema
was obtained via Java reflection, then the original Java bean class.)
- * An unmarshaller that converts a conforming XML document into the
equivalent Java bean.
- * Vice versa, a marshaller that converts the Java bean back into the
original XML document.</description>
- <repository />
- <mailingLists>
- <mailingList>
- <name>[email protected]</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
-
<archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listId=172</archive>
- </mailingList>
- </mailingLists>
- <build />
- <reports>
- <report>maven-license-plugin</report>
- <report>maven-changes-plugin</report>
- <report>maven-multiproject-plugin</report>
+-->
+<project>
+ <pomVersion>1</pomVersion>
+ <id>jaxme:JaxMeAll</id>
+ <artifactId>JaxMeAll</artifactId>
+ <name>JaxMe</name>
+ <groupId>jaxme</groupId>
+ <organization />
+ <description>A Java/XML binding compiler takes as input a schema
description (in most cases an XML schema but it may be a DTD, a RelaxNG schema,
a Java class inspected via reflection or a database schema). The output is a
set of Java classes:
+
+ * A Java bean class compatible with the schema description. (If the schema
was obtained via Java reflection, then the original Java bean class.)
+ * An unmarshaller that converts a conforming XML document into the
equivalent Java bean.
+ * Vice versa, a marshaller that converts the Java bean back into the
original XML document.
+A Java/XML binding compiler takes as input a schema description (in most cases
an XML schema but it may be a DTD, a RelaxNG schema, a Java class inspected via
reflection or a database schema). The output is a set of Java classes:
+
+ * A Java bean class compatible with the schema description. (If the schema
was obtained via Java reflection, then the original Java bean class.)
+ * An unmarshaller that converts a conforming XML document into the
equivalent Java bean.
+ * Vice versa, a marshaller that converts the Java bean back into the
original XML document.</description>
+ <repository />
+ <mailingLists>
+ <mailingList>
+ <name>[email protected]</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+
<archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listId=172</archive>
+ </mailingList>
+ </mailingLists>
+ <build />
+ <reports>
+ <report>maven-license-plugin</report>
+ <report>maven-changes-plugin</report>
+ <report>maven-multiproject-plugin</report>
<!--
<report>maven-jcoverage-plugin</report>
<report>maven-changelog-plugin</report>
@@ -59,7 +61,7 @@
<report>maven-tasklist-plugin</report>
<report>maven-jxr-plugin</report>
<report>maven-linkcheck-plugin</report>
--->
- </reports>
-</project>
-
+-->
+ </reports>
+</project>
+
Modified: webservices/jaxme/branches/MAVEN/projects/api/project.xml
URL:
http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/api/project.xml?rev=234455&r1=234454&r2=234455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/api/project.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/api/project.xml Mon Aug 22
01:46:26 2005
@@ -17,6 +17,8 @@
-->
<project>
+ <pomVersion>3</pomVersion>
+ <groupId>jaxme</groupId>
<build />
<extend>../../common-build/project.xml</extend>
<id>jaxme:jaxmeapi</id>
@@ -48,11 +50,11 @@
<version>1.0.b2</version>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>commons-jelly</groupId>
- <artifactId>commons-jelly-tags-fmt</artifactId>
- <version>1.0</version>
- </dependency>
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-fmt</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
</project>
Modified: webservices/jaxme/branches/MAVEN/projects/jm/project.xml
URL:
http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/jm/project.xml?rev=234455&r1=234454&r2=234455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/jm/project.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/jm/project.xml Mon Aug 22
01:46:26 2005
@@ -77,7 +77,7 @@
<name>Veniamin Fichin</name>
<email>3ca28f66 at mail.ru</email>
</contributor>
- </contributors>
+ </contributors>
<build>
<unitTest>
<includes>
@@ -94,6 +94,14 @@
</resource>
</resources>
</unitTest>
+ <sourceModifications>
+ <sourceModification>
+
<className>com.sun.org.apache.xerces.internal.impl.xpath.regex.RegularExpression</className>
+ <excludes>
+ <exclude>**/Java5REHandler.java</exclude>
+ </excludes>
+ </sourceModification>
+ </sourceModifications>
</build>
<extend>../../common-build/project.xml</extend>
<dependencies>
@@ -131,10 +139,10 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.5.0</version>
- <type>jar</type>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.5.0</version>
+ <type>jar</type>
</dependency>
</dependencies>
</project>
Modified: webservices/jaxme/branches/MAVEN/projects/js/project.xml
URL:
http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/js/project.xml?rev=234455&r1=234454&r2=234455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/js/project.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/js/project.xml Mon Aug 22
01:46:26 2005
@@ -18,9 +18,11 @@
-->
<project>
<extend>../../common-build/project.xml</extend>
+ <pomVersion>3</pomVersion>
<id>jaxme:jaxmejs</id>
<artifactId>jaxmejs</artifactId>
<name>JaxMeJS</name>
+ <groupId>jaxme</groupId>
<package>org.apache.ws.jaxme.js</package>
<description>This is a framework for generating Java sources. It is based
on an abstraction of the Java sources. For instance, there is an object called
JavaSource. This object can have embedded instances of JavaMethod or JavaField,
it can have inner classes, constructors, and so on. You get the idea. Compared
to a basic approach of just using Writer.write(String), the framework has the
obvious disadvantage of additional complexity and overhead.</description>
<contributors>
Modified: webservices/jaxme/branches/MAVEN/projects/xs/project.xml
URL:
http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/xs/project.xml?rev=234455&r1=234454&r2=234455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/xs/project.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/xs/project.xml Mon Aug 22
01:46:26 2005
@@ -17,9 +17,11 @@
-->
<project>
- <id>jaxmexs:jaxmexs</id>
+ <pomVersion>3</pomVersion>
+ <id>jaxme:jaxmexs</id>
<artifactId>jaxmexs</artifactId>
<name>JaxMeXS</name>
+ <groupId>jaxme</groupId>
<package>org.apache.ws.jaxme.xs</package>
<description>This is JaxMeXS, a parser for XML schema. Yet another one, to
be precise. As there are a lot of other parsers around, the question arises:
What makes it different? What advantages does it have?

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
