[legstar-transport-dev] [47] trunk/dist: Created a parent/child POM relationship for build-tools because otherwise its maven site was overwriting the parent maven site.
|
View:
New views
1 Messages
—
Rating Filter:
Alert me
|
 |
[legstar-transport-dev] [47] trunk/dist: Created a parent/child POM relationship for build-tools because otherwise its maven site was overwriting the parent maven site.
by fady-3
::
Rate this Message:
Some parts of this message have been removed.
Learn more about Nabble's security policy.
Log MessageCreated a parent/child POM relationship for build-tools because otherwise its maven site was overwriting the parent maven site. Also first steps toward fixing LEGSTAR-1. Modified Paths
DiffModified: trunk/build-tools/pom.xml (46 => 47)--- trunk/build-tools/pom.xml 2008-07-24 13:27:44 UTC (rev 46) +++ trunk/build-tools/pom.xml 2008-07-25 07:26:20 UTC (rev 47) @@ -1,6 +1,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.mule.transports</groupId> + <parent> + <groupId>org.mule.transports</groupId> + <artifactId>mule-transport-legstar-pom</artifactId> + <version>1.0-RC3-SNAPSHOT</version> + </parent> <artifactId>mule-transport-legstar-build-tools</artifactId> <packaging>jar</packaging> <version>1.0-RC3-SNAPSHOT</version> Modified: trunk/dist/pom.xml (46 => 47)--- trunk/dist/pom.xml 2008-07-24 13:27:44 UTC (rev 46) +++ trunk/dist/pom.xml 2008-07-25 07:26:20 UTC (rev 47) @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.mule.transports</groupId> - <version>1.0-RC1</version> + <version>1.0-RC2</version> <properties> <muleVersion>1.4.4</muleVersion> <primaryArtifactId>mule-transport-legstar</primaryArtifactId> @@ -56,12 +56,12 @@ <dependency> <groupId>org.mule.transports</groupId> <artifactId>mule-transport-legstar</artifactId> - <version>1.0-RC1</version> + <version>1.0-RC2</version> </dependency> <dependency> <groupId>org.mule.transports</groupId> <artifactId>mule-transport-legstar-tools</artifactId> - <version>1.0-RC1</version> + <version>1.0-RC2</version> </dependency> <dependency> <groupId>com.legsem.legstar</groupId> Modified: trunk/tools/src/main/java/org/mule/providers/legstar/model/CixsMuleComponent.java (46 => 47)--- trunk/tools/src/main/java/org/mule/providers/legstar/model/CixsMuleComponent.java 2008-07-24 13:27:44 UTC (rev 46) +++ trunk/tools/src/main/java/org/mule/providers/legstar/model/CixsMuleComponent.java 2008-07-25 07:26:20 UTC (rev 47) @@ -26,17 +26,17 @@ public class CixsMuleComponent extends AbstractCixsService { - /** List of additional classpath elements that might be needed to by + /** List of additional classpath elements that might be needed by * generated Mule startup procedure. */ - private List < Path > mMuleStartupClassPaths = new ArrayList < Path > (); + private List < Path > mMuleStartupPathElements = new ArrayList < Path > (); /** * @param path an additional classpath element that might be needed * by generated Mule startup procedure */ - public final void addMuleStartupClassPath(final Path path) + public final void addMuleStartupPathElement(final Path path) { - mMuleStartupClassPaths.add(path); + mMuleStartupPathElements.add(path); } /** @@ -46,7 +46,7 @@ public final List < String > getMuleStartupPathElements() { List < String > pathElements = new ArrayList < String > (); - for (Path path : mMuleStartupClassPaths) + for (Path path : mMuleStartupPathElements) { for (String pathElement : path.list()) { @@ -74,7 +74,7 @@ PathElement pathElement = path.createPathElement(); pathElement.setLocation(new File(element)); } - mMuleStartupClassPaths.add(path); + mMuleStartupPathElements.add(path); } } Modified: trunk/tools/src/main/resources/vlc/build-cixs2mule-xml.vm (46 => 47)--- trunk/tools/src/main/resources/vlc/build-cixs2mule-xml.vm 2008-07-24 13:27:44 UTC (rev 46) +++ trunk/tools/src/main/resources/vlc/build-cixs2mule-xml.vm 2008-07-25 07:26:20 UTC (rev 47) @@ -76,13 +76,13 @@ </cixsOperation> #end #if ($antModel.cixsMuleComponent.muleStartupPathElements.size() > 0) - <muleStartupClassPath> + <muleStartupPathElement> <path> #foreach ($muleStartupPathElement in $antModel.cixsMuleComponent.muleStartupPathElements) <pathelement location="${muleStartupPathElement}"/> #end </path> - </muleStartupClassPath> + </muleStartupPathElement> #end </cixsMuleComponent> </cixs2mulegen> Modified: trunk/tools/src/main/resources/vlc/build-mule2cixs-xml.vm (46 => 47)--- trunk/tools/src/main/resources/vlc/build-mule2cixs-xml.vm 2008-07-24 13:27:44 UTC (rev 46) +++ trunk/tools/src/main/resources/vlc/build-mule2cixs-xml.vm 2008-07-25 07:26:20 UTC (rev 47) @@ -80,13 +80,13 @@ </cixsOperation> #end #if ($antModel.cixsMuleComponent.muleStartupPathElements.size() > 0) - <muleStartupClassPath> + <muleStartupPathElement> <path> #foreach ($muleStartupPathElement in $antModel.cixsMuleComponent.muleStartupPathElements) <pathelement location="${muleStartupPathElement}"/> #end </path> - </muleStartupClassPath> + </muleStartupPathElement> #end </cixsMuleComponent> </mule2cixsgen> Modified: trunk/tools/src/main/resources/vlc/cixsmule-start-mule-xml.vm (46 => 47)--- trunk/tools/src/main/resources/vlc/cixsmule-start-mule-xml.vm 2008-07-24 13:27:44 UTC (rev 46) +++ trunk/tools/src/main/resources/vlc/cixsmule-start-mule-xml.vm 2008-07-25 07:26:20 UTC (rev 47) @@ -22,13 +22,9 @@ <arg value="${conf.file}"/> <classpath> <dirset dir="${basedir}/conf"/> -#if($muleComponent.muleStartupPathElements.size() > 0) - <files> -#foreach ($classPathElement in $muleComponent.muleStartupPathElements) - <include name="$classPathElement"/> +#foreach ($muleStartupPathElement in $muleComponent.muleStartupPathElements) + <pathelement location="$muleStartupPathElement"/> #end - </files> -#end <dirset dir="${targetBinDir}"/> #if($targetBinDir != $custBinDir) <dirset dir="${custBinDir}"/> Modified: trunk/tools/src/test/java/org/mule/providers/legstar/gen/XmlTemplatesTest.java (46 => 47)--- trunk/tools/src/test/java/org/mule/providers/legstar/gen/XmlTemplatesTest.java 2008-07-24 13:27:44 UTC (rev 46) +++ trunk/tools/src/test/java/org/mule/providers/legstar/gen/XmlTemplatesTest.java 2008-07-25 07:26:20 UTC (rev 47) @@ -147,7 +147,7 @@ "start-mule-bridge-config-" + muleComponent.getName() + ".xml"); assertTrue(resStr.replace("\\", "/").contains("<property name=\"conf.file\" value=\"file:///src/test/gen/conf/mule-bridge-config-lsfileae.xml\"/>")); - assertTrue(resStr.replace("\\", "/").contains("<include name=\"c:/some.additional.jar\"/>")); + assertTrue(resStr.replace("\\", "/").contains("<pathelement location=\"c:/some.additional.jar\"/>")); assertTrue(resStr.contains("<dirset dir=\"target/gen-classes\"/>")); assertTrue(resStr.contains("<dirset dir=\"legstar-coxbgen-cases/target/classes\"/>")); assertTrue(resStr.replace("\\", "/").contains("<dirset dir=\"src/test/gen/prop\"/>")); --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "MuleForge Dev" group. To post to this group, send email to muleforgedev@... To unsubscribe from this group, send email to muleforgedev-unsubscribe@... For more options, visit this group at http://groups.google.com/group/muleforgedev?hl=en -~----------~----~----~----~------~----~------~--~--- --------------------------------------------------------------------- To unsubscribe from this list, please visit: http://admin.muleforge.org/manage_email |
| Free Forum Powered by Nabble | Forum Help |