Author: jeff.yuchang Date: 2009-11-15 10:48:31 -0500 (Sun, 15 Nov 2009) New Revision: 87 Removed: runtime/trunk/distribution/src/files/ runtime/trunk/distribution/src/main/assembly/docs.xml runtime/trunk/distribution/src/main/assembly/src.xml runtime/trunk/distribution/src/main/release/samples/jbossesb/trailblazer/ Modified: runtime/trunk/distribution/pom.xml runtime/trunk/distribution/src/main/assembly/bin.xml runtime/trunk/distribution/src/main/release/install/build.xml runtime/trunk/docs/pom.xml runtime/trunk/docs/samplesguide/pom.xml runtime/trunk/docs/userguide/pom.xml runtime/trunk/jbossesb/src/main/configs/esb-assembly.xml Log: * move the validator related stuff into validator sub project. Modified: runtime/trunk/distribution/pom.xml =================================================================== --- runtime/trunk/distribution/pom.xml 2009-11-15 13:05:24 UTC (rev 86) +++ runtime/trunk/distribution/pom.xml 2009-11-15 15:48:31 UTC (rev 87) @@ -85,66 +85,26 @@ </resource> </resources> <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - <executions> - <execution> - <id>docs</id> - <phase>process-resources</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>savara-${project.version}-docs</finalName> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/main/assembly/docs.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - <executions> - <execution> - <id>src</id> - <phase>process-resources</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>savara-${project.version}-src</finalName> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/main/assembly/src.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - <executions> - <execution> - <id>bin</id> - <phase>process-resources</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>savara-${project.version}</finalName> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> + <executions> + <execution> + <id>bin</id> + <phase>process-resources</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>savara-runtime-${project.version}</finalName> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> Modified: runtime/trunk/distribution/src/main/assembly/bin.xml =================================================================== --- runtime/trunk/distribution/src/main/assembly/bin.xml 2009-11-15 13:05:24 UTC (rev 86) +++ runtime/trunk/distribution/src/main/assembly/bin.xml 2009-11-15 15:48:31 UTC (rev 87) @@ -28,16 +28,6 @@ <fileSets> - <fileSet> - <directory>src/files/eclipse</directory> - <outputDirectory>tools</outputDirectory> - </fileSet> - - <fileSet> - <directory>src/files/validator/jbossesb</directory> - <outputDirectory>modules/savara-validator-jbossesb</outputDirectory> - </fileSet> - <!--Copy files like License and samples etc --> <fileSet> <directory>src/main/release</directory> @@ -55,29 +45,20 @@ <!-- copy documents --> <fileSet> - <directory>../docs/docbook/userguide/target/docbook/publish/en-US</directory> + <directory>../docs/userguide/target/docbook/publish/en-US</directory> <outputDirectory>docs/userguide</outputDirectory> </fileSet> <fileSet> - <directory>../docs/docbook/samplesguide/target/docbook/publish/en-US</directory> + <directory>../docs/samplesguide/target/docbook/publish/en-US</directory> <outputDirectory>docs/samplesguide</outputDirectory> </fileSet> - <fileSet> - <directory>../docs/docbook/gettingstartedguide/target/docbook/publish/en-US</directory> - <outputDirectory>docs/gettingstartedguide</outputDirectory> - </fileSet> - <fileSet> - <directory>../runtime/jbossesb/target/javadoc</directory> + <directory>../jbossesb/target/javadoc</directory> <outputDirectory>docs/savara-runtime-jbossesb-javadoc</outputDirectory> </fileSet> - - <fileSet> - <directory>../validator/jbossesb/target/javadoc</directory> - <outputDirectory>docs/savara-validator-jbossesb-javadoc</outputDirectory> - </fileSet> + <!-- End of copying documents --> <!-- copy samples --> @@ -125,10 +106,6 @@ <directory>../samples/jbossesb/client</directory> <outputDirectory>samples/client</outputDirectory> </fileSet> - <fileSet> - <directory>../samples/jbossesb/trailblazer</directory> - <outputDirectory>samples/trailblazer</outputDirectory> - </fileSet> <!-- End of copying examples --> </fileSets> @@ -138,16 +115,9 @@ <outputDirectory>modules</outputDirectory> <unpack>true</unpack> <includes> - <include>org.jboss.savara:savara-runtime-jbossesb:zip:dist</include> + <include>org.jboss.savara.runtime:savara-runtime-jbossesb:zip:dist</include> </includes> </dependencySet> - <dependencySet> - <outputDirectory>modules/savara-validator-jbossesb</outputDirectory> - <unpack>true</unpack> - <includes> - <include>org.jboss.savara:savara-validator-jbossesb:zip:dist</include> - </includes> - </dependencySet> <!-- Need to copy libraries into each of the samples Eclipse projects as the jars must be referenced locally within each project. The Deleted: runtime/trunk/distribution/src/main/assembly/docs.xml =================================================================== --- runtime/trunk/distribution/src/main/assembly/docs.xml 2009-11-15 13:05:24 UTC (rev 86) +++ runtime/trunk/distribution/src/main/assembly/docs.xml 2009-11-15 15:48:31 UTC (rev 87) @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - * - * (C) 2008 ---> -<assembly> - <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> - <id>docs</id> - <includeBaseDirectory>true</includeBaseDirectory> - <formats> - <format>zip</format> - </formats> - - <fileSets> - <fileSet> - <directory>../docs/docbook/userguide/target/docbook/publish/en-US</directory> - <outputDirectory>docs/userguide</outputDirectory> - </fileSet> - - <fileSet> - <directory>../docs/docbook/samplesguide/target/docbook/publish/en-US</directory> - <outputDirectory>docs/samplesguide</outputDirectory> - </fileSet> - - <fileSet> - <directory>../docs/docbook/gettingstartedguide/target/docbook/publish/en-US</directory> - <outputDirectory>docs/gettingstartedguide</outputDirectory> - </fileSet> - - <fileSet> - <directory>../runtime/jbossesb/target/javadoc</directory> - <outputDirectory>docs/savara-runtime-jbossesb-javadoc</outputDirectory> - </fileSet> - - <fileSet> - <directory>../validator/jbossesb/target/javadoc</directory> - <outputDirectory>docs/savara-validator-jbossesb-javadoc</outputDirectory> - </fileSet> - - </fileSets> - -</assembly> Deleted: runtime/trunk/distribution/src/main/assembly/src.xml =================================================================== --- runtime/trunk/distribution/src/main/assembly/src.xml 2009-11-15 13:05:24 UTC (rev 86) +++ runtime/trunk/distribution/src/main/assembly/src.xml 2009-11-15 15:48:31 UTC (rev 87) @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - * - * (C) 2008 ---> -<assembly> - <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> - <id>src</id> - <includeBaseDirectory>true</includeBaseDirectory> - <formats> - <format>zip</format> - </formats> - - <fileSets> - - <fileSet> - <directory>..</directory> - <outputDirectory>src</outputDirectory> - <excludes> - <exclude>**/.project</exclude> - <exclude>**/.classpath</exclude> - <exclude>**/.settings</exclude> - <exclude>**/.settings/**/*</exclude> - <exclude>**/target</exclude> - <exclude>**/target/**/*</exclude> - </excludes> - </fileSet> - </fileSets> - -</assembly> Modified: runtime/trunk/distribution/src/main/release/install/build.xml =================================================================== --- runtime/trunk/distribution/src/main/release/install/build.xml 2009-11-15 13:05:24 UTC (rev 86) +++ runtime/trunk/distribution/src/main/release/install/build.xml 2009-11-15 15:48:31 UTC (rev 87) @@ -1,4 +1,4 @@ -<project name="Overlord_CDL_Installer" default="deploy-savara-runtime" basedir="."> +<project name="SAVARA_Runtime_Installer" default="deploy" basedir="."> <!-- Set deployment properties filename --> <property name="org.jboss.esb.deployment.properties" location="deployment.properties"/> @@ -24,36 +24,17 @@ <fail unless="esb.server.configured" message="Cannot determine target deployment, please check deployment.properties"/> </target> - <target name="deploy-savara-runtime" description="Deploys Savara Runtime to the server"> + <target name="deploy" description="Deploys Savara Runtime to the server"> <echo message="Deploy savara runtime to JBoss ESB server" /> <copy todir="${deploy.dir}/savara-runtime-jbossesb.esb"> <fileset dir="${modules}/savara-runtime-jbossesb.esb"/> </copy> </target> - <target name="undeploy-savara-runtime" description="Undeploys Savara Runtime"> + <target name="undeploy" description="Undeploys Savara Runtime"> <echo message="Undeploy the savara runtime jbossesb from JBoss ESB server" /> <delete dir="${deploy.dir}/savara-runtime-jbossesb.esb" /> </target> - <target name="deploy-savara-validator" depends="check.deploy.props" description="Deploys Savara validator to the server"> - <echo message="Deploy Savara validator" /> - <ant dir="${modules}/savara-validator-jbossesb" target="deploy"> - <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/> - <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/> - </ant> - </target> - - <target name="undeploy-savara-validator" depends="check.deploy.props" description="Undeploys Overlord CDL validator to the server"> - <echo message="Undeploy Savara validator" /> - <ant dir="${modules}/savara-validator-jbossesb" target="undeploy"> - <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/> - <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/> - </ant> - </target> - - <target name="deploy" depends="deploy-savara-runtime, deploy-savara-validator" description="Deploy Savara components."/> - - <target name="undeploy" depends="undeploy-savara-runtime, undeploy-savara-validator" description="Undeploy Savara components."/> </project> Modified: runtime/trunk/docs/pom.xml =================================================================== --- runtime/trunk/docs/pom.xml 2009-11-15 13:05:24 UTC (rev 86) +++ runtime/trunk/docs/pom.xml 2009-11-15 15:48:31 UTC (rev 87) @@ -18,7 +18,6 @@ <modules> <module>userguide</module> <module>samplesguide</module> - <module>gettingstartedguide</module> </modules> </project> Modified: runtime/trunk/docs/samplesguide/pom.xml =================================================================== --- runtime/trunk/docs/samplesguide/pom.xml 2009-11-15 13:05:24 UTC (rev 86) +++ runtime/trunk/docs/samplesguide/pom.xml 2009-11-15 15:48:31 UTC (rev 87) @@ -7,10 +7,10 @@ <groupId>org.jboss.savara.docs</groupId> <artifactId>samplesguide</artifactId> <packaging>jdocbook</packaging> - <name>Savara::docs::samplesguide</name> + <name>Savara::Runtime::docs::samplesguide</name> <parent> - <groupId>org.jboss.savara</groupId> + <groupId>org.jboss.savara.runtime</groupId> <artifactId>docs</artifactId> <version>1.0-SNAPSHOT</version> </parent> @@ -82,5 +82,4 @@ </plugins> </build> - </project> Modified: runtime/trunk/docs/userguide/pom.xml =================================================================== --- runtime/trunk/docs/userguide/pom.xml 2009-11-15 13:05:24 UTC (rev 86) +++ runtime/trunk/docs/userguide/pom.xml 2009-11-15 15:48:31 UTC (rev 87) @@ -7,10 +7,10 @@ <groupId>org.jboss.savara.docs</groupId> <artifactId>userguide</artifactId> <packaging>jdocbook</packaging> - <name>Savara::docs::userguide</name> + <name>Savara::Runtime::docs::userguide</name> <parent> - <groupId>org.jboss.savara</groupId> + <groupId>org.jboss.savara.runtime</groupId> <artifactId>docs</artifactId> <version>1.0-SNAPSHOT</version> </parent> @@ -82,5 +82,4 @@ </plugins> </build> - </project> Modified: runtime/trunk/jbossesb/src/main/configs/esb-assembly.xml =================================================================== --- runtime/trunk/jbossesb/src/main/configs/esb-assembly.xml 2009-11-15 13:05:24 UTC (rev 86) +++ runtime/trunk/jbossesb/src/main/configs/esb-assembly.xml 2009-11-15 15:48:31 UTC (rev 87) @@ -20,7 +20,7 @@ <dependencySet> <outputDirectory>/</outputDirectory> <includes> - <include>org.jboss.savara:savara-runtime-jbossesb</include> + <include>org.jboss.savara.runtime:savara-runtime-jbossesb</include> </includes> </dependencySet> </dependencySets>