Author: lresende
Date: Tue Feb 12 21:44:50 2008
New Revision: 627249
URL: http://svn.apache.org/viewvc?rev=627249&view=rev
Log:
Generating web.xml during webapp folder and creating properties for and and
python scripts
Modified:
incubator/tuscany/java/sca/itest/build-was-integration.xml
incubator/tuscany/java/sca/itest/pom.xml
Modified: incubator/tuscany/java/sca/itest/build-was-integration.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/build-was-integration.xml?rev=627249&r1=627248&r2=627249&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/build-was-integration.xml (original)
+++ incubator/tuscany/java/sca/itest/build-was-integration.xml Tue Feb 12
21:44:50 2008
@@ -48,14 +48,14 @@
<target name="installApplication">
<echo>Installing war ${application.war} on ${application.server} using
name ${application.name} and context root ${application.contextRoot} </echo>
<exec dir="." executable="${env.WAS_HOME}/bin/wsadmin.sh">
- <arg line="-conntype SOAP -lang jython -f ../wasAdmin.py
installApplicationOnServer ${application.war} ${application.name}
${application.contextRoot} ${application.server}" />
+ <arg line="-conntype SOAP -lang jython -f ${was.python.script}
installApplicationOnServer ${application.war} ${application.name}
${application.contextRoot} ${application.server}" />
</exec>
</target>
<target name="uninstallApplication">
<echo>Uninstalling ${application.name} </echo>
<exec dir="." executable="${env.WAS_HOME}/bin/wsadmin.sh">
- <arg line="-conntype SOAP -lang jython -f ../wasAdmin.py
uninstallApplicationOnServer ${application.name}" />
+ <arg line="-conntype SOAP -lang jython -f ${was.python.script}
uninstallApplicationOnServer ${application.name}" />
</exec>
</target>
Modified: incubator/tuscany/java/sca/itest/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/pom.xml?rev=627249&r1=627248&r2=627249&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/pom.xml Tue Feb 12 21:44:50 2008
@@ -45,6 +45,12 @@
</dependency>
</dependencies>
+ <properties>
+ <was.ant.script>${basedir}/build-was-integration.xml</was.ant.script>
+ <was.python.script>${basedir}/wasAdmin.py</was.python.script>
+ </properties>
+
+
<profiles>
<profile>
<id>default</id>
@@ -215,6 +221,22 @@
</plugin>
-->
+ <!-- Generate web-xml -->
+ <plugin>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-web-junit</artifactId>
+ <version>1.2-incubating-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>generate-web-xml</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- Create war and include jUnit test classes -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -615,7 +637,7 @@
</goals>
<configuration>
<tasks>
- <ant
antfile="../build-was-integration.xml" target="startServer"/>
+ <ant antfile="${was.ant.script}"
target="startServer"/>
</tasks>
</configuration>
</execution>
@@ -628,7 +650,8 @@
</goals>
<configuration>
<tasks>
- <ant
antfile="../build-was-integration.xml" target="installApplication">
+ <ant antfile="${was.ant.script}"
target="installApplication">
+ <property name="was.python.script"
value="${was.python.script}"/>
<property name="application.war"
value="${project.build.directory}/${project.build.finalName}.war"/>
<property name="application.name"
value="${project.build.finalName}.war"/>
<property
name="application.contextRoot" value="${project.build.finalName}"/>
@@ -646,7 +669,8 @@
</goals>
<configuration>
<tasks>
- <ant
antfile="../build-was-integration.xml" target="uninstallApplication">
+ <ant antfile="${was.ant.script}"
target="uninstallApplication">
+ <property name="was.python.script"
value="${was.python.script}"/>
<property name="application.name"
value="${project.build.finalName}.war"/>
</ant>
</tasks>
@@ -661,7 +685,7 @@
</goals>
<configuration>
<tasks>
- <ant
antfile="../build-was-integration.xml" target="stopServer"/>
+ <ant antfile="${was.ant.script}"
target="stopServer"/>
</tasks>
</configuration>
</execution>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
