You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/08/16 17:06:25 UTC
svn commit: r566743 - in /activemq/camel/trunk/tooling: camel-xsddoc/
camel-xsddoc/pom.xml pom.xml
Author: jstrachan
Date: Thu Aug 16 08:06:22 2007
New Revision: 566743
URL: http://svn.apache.org/viewvc?view=rev&rev=566743
Log:
added the xsddoc back in, inside a separate module to avoid the previous issue with random ClassNotFoundException...
Added:
activemq/camel/trunk/tooling/camel-xsddoc/
activemq/camel/trunk/tooling/camel-xsddoc/pom.xml
- copied, changed from r566501, activemq/camel/trunk/components/camel-spring/pom.xml
Modified:
activemq/camel/trunk/tooling/pom.xml
Copied: activemq/camel/trunk/tooling/camel-xsddoc/pom.xml (from r566501, activemq/camel/trunk/components/camel-spring/pom.xml)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tooling/camel-xsddoc/pom.xml?view=diff&rev=566743&p1=activemq/camel/trunk/components/camel-spring/pom.xml&r1=566501&p2=activemq/camel/trunk/tooling/camel-xsddoc/pom.xml&r2=566743
==============================================================================
--- activemq/camel/trunk/components/camel-spring/pom.xml (original)
+++ activemq/camel/trunk/tooling/camel-xsddoc/pom.xml Thu Aug 16 08:06:22 2007
@@ -28,126 +28,18 @@
<version>1.1-SNAPSHOT</version>
</parent>
- <artifactId>camel-spring</artifactId>
- <name>Camel :: Spring</name>
- <description>Camel Spring support</description>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxb-api</artifactId>
- <optional>false</optional>
- </dependency>
-
- <!-- for parsing the XML -->
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
-
- <!-- for testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <repositories>
- <!-- for maven jaxb plugin -->
- <repository>
- <id>java.net</id>
- <name>java.net Maven Repository</name>
- <url>http://download.java.net/maven/1</url>
- <!--<url>https://maven-repository.dev.java.net/nonav/repository</url>-->
- <layout>legacy</layout>
- </repository>
- </repositories>
+ <artifactId>camel-xsddoc</artifactId>
+ <name>Camel :: XSD Doc</name>
+ <description>Camel XSD Doc</description>
<build>
- <resources>
- <resource>
- <directory>target/schema</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
<plugins>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <excludes>
- </excludes>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>process-sources</id>
- <phase>process-sources</phase>
- <configuration>
- <tasks>
- <echo>Copying to code together for the XSD generation</echo>
-
- <mkdir dir="${project.build.directory}/schema-src"/>
- <copy todir="${project.build.directory}/schema-src">
- <fileset dir="${basedir}/src/main/java">
- <include name="org/apache/camel/spring/Camel*.java"/>
- <include name="org/apache/camel/spring/Endpoint*.java"/>
- <include name="org/apache/camel/spring/package-info.java"/>
- </fileset>
- <fileset dir="${basedir}/../../camel-core/src/main/java">
- <include name="org/apache/camel/model/**/*.java"/>
- </fileset>
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
<id>site</id>
<phase>site</phase>
<configuration>
@@ -155,16 +47,19 @@
<echo>Running the XSDDoc task</echo>
<mkdir dir="${basedir}/target/site/xsddoc"/>
- <path id="cp">
- <path refid="maven.test.classpath"/>
- <path refid="maven.compile.classpath"/>
- <path refid="maven.dependency.classpath"/>
- </path>
+ <!--
+ <path id="cp">
+ <path refid="maven.plugin.classpath"/>
+ <path refid="maven.test.classpath"/>
+ <path refid="maven.compile.classpath"/>
+ <path refid="maven.dependency.classpath"/>
+ </path>
+ -->
<taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task">
- <classpath refid="cp"/>
+ <classpath refid="maven.plugin.classpath"/>
</taskdef>
- <xsddoc file="${project.build.directory}/schema/camel-spring.xsd"
+ <xsddoc file="${basedir}/../../components/camel-spring/target/schema/camel-spring.xsd"
out="${basedir}/target/site/xsddoc"
doctitle="Apache Camel XML Schema Reference"
header="<a href='http://activemq.apache.org/camel/'>Apache Camel</a>"
@@ -179,20 +74,6 @@
<goal>run</goal>
</goals>
</execution>
-
- <execution>
- <id>package</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <echo>Deleting unwanted resources from the test-jar</echo>
- <delete file="${project.build.directory}/test-classes/log4j.properties" verbose="true"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
</executions>
<dependencies>
<dependency>
@@ -200,99 +81,14 @@
<artifactId>maven-xsddoc-plugin</artifactId>
<version>1.0</version>
</dependency>
-<!--
<dependency>
<groupId>xsddoc</groupId>
<artifactId>xsddoc</artifactId>
<version>1.0</version>
</dependency>
--->
</dependencies>
</plugin>
-
-
- <!-- generate the attached tests jar -->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <!-- TODO: this doesn't work - if ever we can figure out the maven ninja to get it working -->
- <!-- TODO: we can zap the Ant package phase stuff above -->
- <excludes>
- <exclude>**/*/log4j.properties</exclude>
- </excludes>
- </configuration>
- </plugin>
-
-
- <plugin>
- <groupId>com.sun.tools.jxc.maven2</groupId>
- <artifactId>maven-jaxb-schemagen-plugin</artifactId>
- <!--<version>1.3-dev</version>-->
- <executions>
- <execution>
- <phase>process-sources</phase>
- <configuration>
- <destdir>${project.build.directory}/schema</destdir>
- <srcdir>${project.build.directory}/schema-src</srcdir>
- <schemas>
- <schema>
- <namespace>http://activemq.apache.org/camel/schema/spring</namespace>
- <file>camel-spring.xsd</file>
- </schema>
- </schemas>
- <!--<verbose>false</verbose>-->
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.build.directory}/schema/camel-spring.xsd</file>
- <type>xsd</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <mainClass>org.apache.camel.spring.Main</mainClass>
- </configuration>
- </plugin>
</plugins>
+
</build>
</project>
Modified: activemq/camel/trunk/tooling/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tooling/pom.xml?view=diff&rev=566743&r1=566742&r2=566743
==============================================================================
--- activemq/camel/trunk/tooling/pom.xml (original)
+++ activemq/camel/trunk/tooling/pom.xml Thu Aug 16 08:06:22 2007
@@ -32,8 +32,9 @@
<packaging>pom</packaging>
<modules>
- <module>archetypes</module>
+ <module>camel-xsddoc</module>
<module>maven</module>
+ <module>archetypes</module>
<module>camel-manual</module>
</modules>