Author: dgolovin Date: 2010-07-01 19:09:19 -0400 (Thu, 01 Jul 2010) New Revision: 23163 Added: trunk/esb/tests/org.jboss.tools.esb.project.core.test/requirements.properties Modified: trunk/esb/features/org.jboss.tools.esb.feature/pom.xml trunk/esb/features/org.jboss.tools.esb.test.feature/pom.xml trunk/esb/features/pom.xml trunk/esb/plugins/org.jboss.tools.esb.core/pom.xml trunk/esb/plugins/org.jboss.tools.esb.project.core/pom.xml trunk/esb/plugins/org.jboss.tools.esb.project.ui/pom.xml trunk/esb/plugins/org.jboss.tools.esb.ui/pom.xml trunk/esb/plugins/pom.xml trunk/esb/pom.xml trunk/esb/site/pom.xml trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml trunk/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java trunk/esb/tests/pom.xml Log: 1. maven repo structure aligned to svn repo 2. requirement build migrated to requirements profile by defining requirements.properties file 3. system properties reading is changed to throw exception in case null value returned Modified: trunk/esb/features/org.jboss.tools.esb.feature/pom.xml =================================================================== --- trunk/esb/features/org.jboss.tools.esb.feature/pom.xml 2010-07-01 22:27:54 UTC (rev 23162) +++ trunk/esb/features/org.jboss.tools.esb.feature/pom.xml 2010-07-01 23:09:19 UTC (rev 23163) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.esb.features</groupId> <artifactId>org.jboss.tools.esb.feature</artifactId> <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> Modified: trunk/esb/features/org.jboss.tools.esb.test.feature/pom.xml =================================================================== --- trunk/esb/features/org.jboss.tools.esb.test.feature/pom.xml 2010-07-01 22:27:54 UTC (rev 23162) +++ trunk/esb/features/org.jboss.tools.esb.test.feature/pom.xml 2010-07-01 23:09:19 UTC (rev 23163) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.esb.features</groupId> <artifactId>org.jboss.tools.esb.test.feature</artifactId> <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> Modified: trunk/esb/features/pom.xml =================================================================== --- trunk/esb/features/pom.xml 2010-07-01 22:27:54 UTC (rev 23162) +++ trunk/esb/features/pom.xml 2010-07-01 23:09:19 UTC (rev 23163) @@ -1,14 +1,9 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> - <parent> - <relativePath>../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>esb.features</artifactId> + <groupId>org.jboss.tools.esb</groupId> + <artifactId>features</artifactId> + <name>esb.features</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -16,4 +11,4 @@ <module>org.jboss.tools.esb.test.feature</module> </modules> </project> - \ No newline at end of file + Modified: trunk/esb/plugins/org.jboss.tools.esb.core/pom.xml =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/pom.xml 2010-07-01 22:27:54 UTC (rev 23162) +++ trunk/esb/plugins/org.jboss.tools.esb.core/pom.xml 2010-07-01 23:09:19 UTC (rev 23163) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.esb.plugins</groupId> <artifactId>org.jboss.tools.esb.core</artifactId> <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/pom.xml =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/pom.xml 2010-07-01 22:27:54 UTC (rev 23162) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/pom.xml 2010-07-01 23:09:19 UTC (rev 23163) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.esb.plugins</groupId> <artifactId>org.jboss.tools.esb.project.core</artifactId> <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/pom.xml =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/pom.xml 2010-07-01 22:27:54 UTC (rev 23162) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/pom.xml 2010-07-01 23:09:19 UTC (rev 23163) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.esb.plugins</groupId> <artifactId>org.jboss.tools.esb.project.ui</artifactId> <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/pom.xml =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.ui/pom.xml 2010-07-01 22:27:54 UTC (rev 23162) +++ trunk/esb/plugins/org.jboss.tools.esb.ui/pom.xml 2010-07-01 23:09:19 UTC (rev 23163) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.esb.plugins</groupId> <artifactId>org.jboss.tools.esb.ui</artifactId> <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/esb/plugins/pom.xml =================================================================== --- trunk/esb/plugins/pom.xml 2010-07-01 22:27:54 UTC (rev 23162) +++ trunk/esb/plugins/pom.xml 2010-07-01 23:09:19 UTC (rev 23163) @@ -1,14 +1,9 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> - <parent> - <relativePath>../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>esb.plugins</artifactId> + <groupId>org.jboss.tools.esb</groupId> + <artifactId>plugins</artifactId> + <name>esb.plugins</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -18,4 +13,4 @@ <module>org.jboss.tools.esb.ui</module> </modules> </project> - \ No newline at end of file + Modified: trunk/esb/pom.xml =================================================================== --- trunk/esb/pom.xml 2010-07-01 22:27:54 UTC (rev 23162) +++ trunk/esb/pom.xml 2010-07-01 23:09:19 UTC (rev 23163) @@ -1,14 +1,9 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> - <parent> - <relativePath>../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> <groupId>org.jboss.tools</groupId> - <artifactId>esb.all</artifactId> + <artifactId>esb</artifactId> + <name>esb.all</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> Modified: trunk/esb/site/pom.xml =================================================================== --- trunk/esb/site/pom.xml 2010-07-01 22:27:54 UTC (rev 23162) +++ trunk/esb/site/pom.xml 2010-07-01 23:09:19 UTC (rev 23163) @@ -6,8 +6,9 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>esb.site</artifactId> + <groupId>org.jboss.tools.esb</groupId> + <artifactId>site</artifactId> + <name>esb.site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> </project> Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml 2010-07-01 22:27:54 UTC (rev 23162) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml 2010-07-01 23:09:19 UTC (rev 23163) @@ -7,8 +7,13 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.esb.tests</groupId> <artifactId>org.jboss.tools.esb.core.test</artifactId> <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <emma.filter>org.jboss.tools.esb.core*</emma.filter> + <emma.instrument.bundles>org.jboss.tools.esb.core,org.jboss.tools.esb.project.core</emma.instrument.bundles> + </properties> </project> Modified: trunk/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF 2010-07-01 22:27:54 UTC (rev 23162) +++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF 2010-07-01 23:09:19 UTC (rev 23163) @@ -5,7 +5,7 @@ Bundle-Version: 1.3.0.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.junit;bundle-version="3.8.2", +Require-Bundle: org.junit, org.jboss.tools.esb.project.core;bundle-version="1.0.0", org.eclipse.wst.common.project.facet.core;bundle-version="1.4.0", org.eclipse.wst.server.core;bundle-version="1.1.101", Modified: trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml 2010-07-01 22:27:54 UTC (rev 23162) +++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml 2010-07-01 23:09:19 UTC (rev 23163) @@ -7,77 +7,28 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.esb.tests</groupId> <artifactId>org.jboss.tools.esb.project.core.test</artifactId> <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> - <!-- build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-test-plugin</artifactId> - <version>${tychoVersion}</version> - <configuration> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.jst.web_ui.feature.feature.group</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.web_ui.feature.feature.group</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> - </configuration> - </plugin> - </plugins> - </build--> - <properties> - <requirements>soap,jbossas</requirements> - <projectRoot>${basedir}/../../..</projectRoot> - <requirements.build>${projectRoot}/requirements/target</requirements.build> + + <properties> + <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-soa-p.5.0.0/jboss-as -Djbosstools.test.jboss.home.5.0=${requirement.build.root}/jboss-soa-p.5.0.0/jboss-as -Djbosstools.test.jboss.home.5.1=${requirement.build.root}/jboss-5.1.0.GA -Djbosstools.test.soap.home.4.3=${requirement.build.root}/jboss-soa-p.4.3.0 -Djbosstools.test.soap.home.5.0=${requirement.build.root}/jboss-soa-p.5.0.0</systemProperties> + <emma.filter>org.jboss.tools.esb.core*</emma.filter> + <emma.instrument.bundles>org.jboss.tools.esb.project.core</emma.instrument.bundles> </properties> - + <build> <plugins> <plugin> <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-test-plugin</artifactId> <configuration> - <!--environmentVariables> - <jbosstools.test.jboss.home.4.2>${requirements.build}/jboss-soa-p.5.0.0/jboss-as</jbosstools.test.jboss.home.4.2> - <jbosstools.test.jboss.home.5.0>${requirements.build}/jboss-soa-p.5.0.0/jboss-as</jbosstools.test.jboss.home.5.0> - <jbosstools.test.jboss.home.5.1>${requirements.build}/jboss-5.1.0.GA</jbosstools.test.jboss.home.5.1> - <jbosstools.test.soap.home.4.3>${requirements.build}/jboss-soa-p.5.0.0</jbosstools.test.soap.home.4.3> - <jbosstools.test.soap.home.5.0>${requirements.build}/jboss-soa-p.5.0.0</jbosstools.test.soap.home.5.0> - </environmentVariables--> - <argLine>-Djbosstools.test.jboss.home.4.2=${requirements.build}/jboss-soa-p.5.0.0/jboss-as -Djbosstools.test.jboss.home.5.0=${requirements.build}/jboss-soa-p.5.0.0/jboss-as -Djbosstools.test.jboss.home.5.1=${requirements.build}/jboss-5.1.0.GA -Djbosstools.test.soap.home.4.3=${requirements.build}/jboss-soa-p.5.0.0 -Djbosstools.test.soap.home.5.0=${requirements.build}/jboss-soa-p.5.0.0</argLine> + <explodedBundles> + <bundle>org.jboss.tools.esb.project.core</bundle> + </explodedBundles> </configuration> </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>prepare-eclipse-base</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant dir="${projectRoot}/requirements" inheritAll="true"> - <property name="requirements" value="${requirements}" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> Added: trunk/esb/tests/org.jboss.tools.esb.project.core.test/requirements.properties =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.project.core.test/requirements.properties (rev 0) +++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/requirements.properties 2010-07-01 23:09:19 UTC (rev 23163) @@ -0,0 +1 @@ +requirements=soap,jbossas \ No newline at end of file Modified: trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java 2010-07-01 22:27:54 UTC (rev 23162) +++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java 2010-07-01 23:09:19 UTC (rev 23163) @@ -1,6 +1,7 @@ package org.jboss.tools.esb.project.core.test; import java.io.File; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -58,25 +59,61 @@ import org.jboss.tools.esb.core.runtime.JBossRuntimeManager; public class ESBProjectDeploymentTest extends TestCase { + private static final String SOAP_HOME_5_0_PROP_NAME = "jbosstools.test.soap.home.5.0"; + + private static final String SOAP_HOME_4_3_PROP_NAME = "jbosstools.test.soap.home.4.3"; + + public static final String BOSS_HOME_5_1_PROP_NAME = "jbosstools.test.jboss.home.5.1"; + + public static final String JBOSS_HOME_5_0_PROP_NAME = "jbosstools.test.jboss.home.5.0"; + + public static final String JBOSS_HOME_4_2_PROP_NAME = "jbosstools.test.jboss.home.4.2"; + public static final IVMInstall VM_INSTALL = JavaRuntime .getDefaultVMInstall(); - public static final String JBOSS_AS_42_HOME = System.getProperty( - "jbosstools.test.jboss.home.4.2", - "/home/fugang/jboss-all/jboss-soa-p.5.0.0/jboss-as"); - public static final String JBOSS_AS_50_HOME = System.getProperty( - "jbosstools.test.jboss.home.5.0", - "/home/fugang/jboss-all/jboss-soa-p.5.0.0/jboss-as"); - public static final String JBOSS_AS_51_HOME = System.getProperty( - "jbosstools.test.jboss.home.5.1", - "/home/fugang/jboss-all/jboss-5.1.0.GA"); - public static final String SERVER_SOAP43_HOME = System.getProperty( - "jbosstools.test.soap.home.4.3", - "/home/fugang/jboss-all/jboss-soa-p.5.0.0") + "//jboss-as"; - public static final String SERVER_SOAP50_HOME = System.getProperty( - "jbosstools.test.soap.home.5.0", - "/home/fugang/jboss-all/jboss-soa-p.5.0.0") + "//jboss-as"; + public static final String JBOSS_AS_42_HOME; + public static final String JBOSS_AS_50_HOME; + public static final String JBOSS_AS_51_HOME; + public static final String SERVER_SOAP43_HOME; + public static final String SERVER_SOAP50_HOME; + + static { + String message = "Use -D{0}=path/to/server to define system property value in command line or " + + "in tab Arguments of Eclipse Application Launch Configuration dialog"; + String syspropValue = System.getProperty(JBOSS_HOME_4_2_PROP_NAME); + if(syspropValue!=null) { + JBOSS_AS_42_HOME = new File(System.getProperty(JBOSS_HOME_4_2_PROP_NAME)).getAbsolutePath(); + } else { + throw new IllegalArgumentException(MessageFormat.format(message, JBOSS_HOME_4_2_PROP_NAME)); + } + syspropValue = System.getProperty(JBOSS_HOME_5_0_PROP_NAME); + if(syspropValue!=null) { + JBOSS_AS_50_HOME = new File(System.getProperty(JBOSS_HOME_5_0_PROP_NAME)).getAbsolutePath(); + } else { + throw new IllegalArgumentException(MessageFormat.format(message, JBOSS_HOME_5_0_PROP_NAME)); + } + syspropValue = System.getProperty(BOSS_HOME_5_1_PROP_NAME); + if(syspropValue!=null) { + JBOSS_AS_51_HOME = new File(System.getProperty(BOSS_HOME_5_1_PROP_NAME)).getAbsolutePath(); + } else { + throw new IllegalArgumentException(MessageFormat.format(message, BOSS_HOME_5_1_PROP_NAME)); + } + syspropValue = System.getProperty(SOAP_HOME_4_3_PROP_NAME); + if(syspropValue!=null) { + SERVER_SOAP43_HOME = new File(System.getProperty(SOAP_HOME_4_3_PROP_NAME) + "//jboss-as").getAbsolutePath(); + } else { + throw new IllegalArgumentException(MessageFormat.format(message, SOAP_HOME_4_3_PROP_NAME)); + } + syspropValue = System.getProperty(SOAP_HOME_5_0_PROP_NAME); + if(syspropValue!=null) { + SERVER_SOAP50_HOME = new File(System.getProperty(SOAP_HOME_5_0_PROP_NAME) + "//jboss-as").getAbsolutePath(); + } else { + throw new IllegalArgumentException(MessageFormat.format(message, SOAP_HOME_5_0_PROP_NAME)); + } + } + static String userCustomizedESBRuntime = "UserCustomizedESBRuntime"; private JBossRuntimeManager jrm = JBossRuntimeManager.getInstance(); Modified: trunk/esb/tests/pom.xml =================================================================== --- trunk/esb/tests/pom.xml 2010-07-01 22:27:54 UTC (rev 23162) +++ trunk/esb/tests/pom.xml 2010-07-01 23:09:19 UTC (rev 23163) @@ -1,14 +1,9 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> - <parent> - <relativePath>../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>esb.tests</artifactId> + <groupId>org.jboss.tools.esb</groupId> + <artifactId>tests</artifactId> + <name>esb.tests</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -16,4 +11,4 @@ <module>org.jboss.tools.esb.project.core.test</module> </modules> </project> - \ No newline at end of file +