*** empty log message ***
diff --git a/plugins/org.eclipse.jst.server.websphere.core/serverdef/scripts/websphere.6.x.xml b/plugins/org.eclipse.jst.server.websphere.core/serverdef/scripts/websphere.6.x.xml
index 2eec05e..5a83015 100644
--- a/plugins/org.eclipse.jst.server.websphere.core/serverdef/scripts/websphere.6.x.xml
+++ b/plugins/org.eclipse.jst.server.websphere.core/serverdef/scripts/websphere.6.x.xml
@@ -20,7 +20,8 @@
<taskdef classpathref="toolpath" name="wsinstallapp" classname="com.ibm.websphere.ant.tasks.InstallApplication" />
<target name="deploy.j2ee.web">
- <jar destfile="${module.name}.war">
+
+ <jar destfile="${project.working.dir}/${module.name}.war">
<zipfileset dir="${module.dir}">
<include name="**/*.*"/>
<exclude name="**/*.war"/>
@@ -36,7 +37,7 @@
<wsadmin
washome="${was.home}"
properties="${wasProfile}/properties/wsadmin.properties"
- command="$AdminApp install ${module.name}.war {-appname ${module.name} -contextroot ${module.name} -usedefaultbindings}"
+ command="$AdminApp install ${project.working.dir}/${module.name}.war {-appname ${module.name} -contextroot ${module.name} -usedefaultbindings}"
failonerror="true">
</wsadmin>
<wsadmin
@@ -48,18 +49,18 @@
</target>
<target name="deploy.j2ee.ejb">
- <jar destfile="${module.name}.jar">
+ <jar destfile="${project.working.dir}/${module.name}.jar">
<zipfileset dir="${module.dir}">
<include name="**/*.*"/>
<exclude name="**/*.java"/>
</zipfileset>
</jar>
<wsejbdeploy
- inputJar="${module.name}.jar"
+ inputJar="${project.working.dir}/${module.name}.jar"
wasHome="${was.home}"
washome="${was.home}"
classpathref="toolpath"
- outputJar="${module.name}-was.jar"
+ outputJar="${project.working.dir}/${module.name}-was.jar"
codegen="true "
keepGenerated="true"
quiet="false"
@@ -81,7 +82,7 @@
<wsadmin
washome="${was.home}"
properties="${wasProfile}/properties/wsadmin.properties"
- command="$AdminApp install ${module.name}.jar {-appname ${module.name} -usedefaultbindings}"
+ command="$AdminApp install ${project.working.dir}/${module.name}.jar {-appname ${module.name} -usedefaultbindings}"
failonerror="true">
</wsadmin>
@@ -95,7 +96,7 @@
<target name="deploy.j2ee.ear">
- <jar destfile="${module.name}.ear">
+ <jar destfile="${project.working.dir}/${module.name}.ear">
<zipfileset dir="${module.dir}">
<include name="**/*.*"/>
<exclude name="**/*.java"/>
@@ -112,7 +113,7 @@
<wsadmin
washome="${was.home}"
properties="${wasProfile}/properties/wsadmin.properties"
- command="$AdminApp install ${module.name}.ear {-appname ${module.name} -deployejb -usedefaultbindings}"
+ command="$AdminApp install ${project.working.dir}/${module.name}.ear {-appname ${module.name} -deployejb -usedefaultbindings}"
failonerror="true">
</wsadmin>
<wsadmin
@@ -125,6 +126,7 @@
</target>
<target name="undeploy.j2ee.web">
+
<wsadmin
washome="${was.home}"
diff --git a/plugins/org.eclipse.jst.server.websphere.core/serverdef/websphere.6.serverdef b/plugins/org.eclipse.jst.server.websphere.core/serverdef/websphere.6.serverdef
index b30d23d..8b3eb33 100644
--- a/plugins/org.eclipse.jst.server.websphere.core/serverdef/websphere.6.serverdef
+++ b/plugins/org.eclipse.jst.server.websphere.core/serverdef/websphere.6.serverdef
@@ -91,19 +91,19 @@
<datavalue>/serverdef/scripts/websphere.6.x.xml</datavalue>
</publisherdata>
<publisherdata>
- <dataname>target.publish.j2ee.web</dataname>
+ <dataname>target.publish.jst.web</dataname>
<datavalue>deploy.j2ee.web</datavalue>
</publisherdata>
<publisherdata>
- <dataname>target.publish.j2ee.ejb</dataname>
+ <dataname>target.publish.jst.ejb</dataname>
<datavalue>deploy.j2ee.ejb</datavalue>
</publisherdata>
<publisherdata>
- <dataname>target.unpublish.j2ee.web</dataname>
+ <dataname>target.unpublish.jst.web</dataname>
<datavalue>undeploy.j2ee.web</datavalue>
</publisherdata>
<publisherdata>
- <dataname>target.unpublish.j2ee.ejb</dataname>
+ <dataname>target.unpublish.jst.ejb</dataname>
<datavalue>undeploy.j2ee.ejb</datavalue>
</publisherdata>
<publisherdata>
