dion 2004/02/04 21:50:23
Modified: was40/xdocs navigation.xml changes.xml
was40 project.xml plugin.jelly project.properties
plugin.properties
Log:
Start work on v1.1
Revision Changes Path
1.2 +3 -6 maven-plugins/was40/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/maven-plugins/was40/xdocs/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 23 Apr 2003 15:53:08 -0000 1.1
+++ navigation.xml 5 Feb 2004 05:50:23 -0000 1.2
@@ -4,14 +4,11 @@
<title>Maven WebSphere 4.0 Plug-in</title>
<body>
<links>
- <item href="http://maven.apache.org/" name="Maven">
- </item>
+ <item href="http://maven.apache.org/" name="Maven" />
</links>
<menu name="Overview">
- <item href="/goals.html" name="Goals">
- </item>
- <item href="/properties.html" name="Properties">
- </item>
+ <item href="/goals.html" name="Goals" />
+ <item href="/properties.html" name="Properties" />
</menu>
</body>
</project>
1.2 +7 -1 maven-plugins/was40/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/was40/xdocs/changes.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- changes.xml 24 Apr 2003 14:09:08 -0000 1.1
+++ changes.xml 5 Feb 2004 05:50:23 -0000 1.2
@@ -7,7 +7,13 @@
<body>
- <release version="1.0" date="in CVS">
+ <release version="1.1" date="in CVS">
+ <action dev="dion" type="update">
+ Added expand, jndi-dump, regen, app-show, list-apps goals
+ </action>
+ </release>
+
+ <release version="1.0" date="Unknown">
<action dev="dion" type="add">
Added plugin provided by Kristen Gillard
</action>
1.10 +3 -3 maven-plugins/was40/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/was40/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 10 Oct 2003 19:21:02 -0000 1.9
+++ project.xml 5 Feb 2004 05:50:23 -0000 1.10
@@ -5,14 +5,14 @@
<pomVersion>3</pomVersion>
<id>maven-was40-plugin</id>
<name>Maven WebSphere 4.0 Plug-in</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.1-SNAPSHOT</currentVersion>
<description>A plugin to manage a WebSphere AppServer 4 installation</description>
<shortDescription>Manipulate WAS 4</shortDescription>
<url>http://maven.apache.org/reference/plugins/was40/</url>
<siteDirectory>/www/maven.apache.org/reference/plugins/was40/</siteDirectory>
<repository>
- <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:maven-plugins/was40/</connection>
- <url>http://cvs.apache.org/viewcvs/maven-plugins/was40/</url>
+ <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:maven/src/plugins-build/was40/</connection>
+ <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/was40/</url>
</repository>
<developers>
<developer>
1.5 +118 -68 maven-plugins/was40/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/was40/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 19 Aug 2003 05:09:26 -0000 1.4
+++ plugin.jelly 5 Feb 2004 05:50:23 -0000 1.5
@@ -1,23 +1,28 @@
<?xml version="1.0"?>
-
<project
xmlns:define="jelly:define"
xmlns:j="jelly:core"
xmlns:u="jelly:util"
xmlns:was40wscp="was40wscp">
-
<!-- set up maven.was40.script -->
<j:choose>
<j:when test="${systemScope['os.name'].startsWith('Windows')}">
<j:set var="maven.was40.script" value="${maven.was40.wscpExe}.bat"/>
<j:set var="maven.was40.startServer.script"
value="${maven.was40.bin}/adminserver.bat" />
+ <j:set var="maven.was40.plugin" value="${maven.was40.bin}/GenPluginCfg.bat"
/>
+ <j:set var="maven.was40.dumpNameSpace"
value="${maven.was40.bin}/dumpNameSpace.bat" />
+ <j:set var="maven.was40.earExpander"
value="${maven.was40.bin}/EARExpander.bat" />
</j:when>
<j:otherwise>
<j:set var="maven.was40.script" value="${maven.was40.wscpExe}.sh"/>
<j:set var="maven.was40.startServer.script"
value="${maven.was40.startNode}.sh" />
+ <j:set var="maven.was40.plugin" value="${maven.was40.bin}/GenPluginCfg.sh"
/>
+ <j:set var="maven.was40.hackplug.hic" value="${maven.was40.bin}/hackplug.sh"
/>
+ <j:set var="maven.was40.dumpNameSpace"
value="${maven.was40.bin}/dumpNameSpace.sh" />
+ <j:set var="maven.was40.earExpander"
value="${maven.was40.bin}/EARExpander.sh" />
</j:otherwise>
</j:choose>
@@ -34,15 +39,38 @@
<fail>attribute command must be provided</fail>
</j:if>
+ <!--
+ wscp.qualifyHomeName=true
+ wscp.remotePasswordFile=
+ wscp.remoteConnectionTimeout=300
+ wscp.remoteConnectionsAllowed=true
+ wscp.remoteHostListAccept=
+ wscp.remoteHostListReject=
+ #
+ # set traceString to enable tracing
+ #
+ # wscp.traceString=com.ibm.ejs.sm.client.ui.desc.*=all=enabled
+ # wscp.traceString=com.ibm.ejs.sm.ejscp.*=all=enabled
+ ##
+ # Typically, these need to be set if only ContextExtension is loaded
+ # (otherwise, EjscpExtension sets them as noted above)
+ #
+ # com.ibm.CORBA.BootstrapHost=pc-dev1
+ # com.ibm.CORBA.BootstrapPort=900
+ # java.naming.factory.initial=com.ibm.ejs.ns.jndi.CNInitialContextFactory
+ -->
+
<!-- delete the properties file here and recreate it -->
<delete file="${java.io.tmpdir}/was40.properties" />
<j:file name="${java.io.tmpdir}/was40.properties" omitXmlDeclaration="true"
escapeText="false">
- wscp.hostName=${maven.was40.node}
+ wscp.hostName=${maven.was40.node}
+ wscp.hostPort=${maven.was40.hostPort}
+ wscp.primaryNode=${maven.was40.primaryNode}
</j:file>
- <u:file name="${java.io.tmpdir}/was40.properties" var="props" />
+ <!-- properties file -->
+ <u:file name="${java.io.tmpdir}/was40.properties" var="props" />
<echo>Executing '${command}' using wscp</echo>
-
<exec executable="${maven.was40.script}" outputproperty="results">
<arg value="-p" />
<arg value="${props.canonicalPath}" />
@@ -50,116 +78,138 @@
<arg value="${command}" />
</exec>
+ <!-- test if arguments have been passed -->
<j:if test="${empty(var)}">
- <echo>Result: ${results}</echo>
+ <echo>${results}</echo>
</j:if>
<j:if test="${!empty(var)}">
<j:set scope="parent" var="${var}" value="${results}" />
</j:if>
-
</define:tag>
-
</define:taglib>
<!-- default goal -->
<goal name="was40"
description="Obtain the list of nodes on the WebSphere Application Server">
- <attainGoal name="was40:list-node" />
+ <attainGoal name="was40:list-node" />
</goal>
<goal name="was40:start"
- description="Starts was40 Application Server">
-
- <echo>Please Wait... Starting node</echo>
- <exec executable="${maven.was40.startServer.script}" />
-
+ description="Starts the specified node.">
+ <echo>Staring Node: '${maven.was40.node}'</echo>
+ <exec executable="${maven.was40.startServer.script}" />
</goal>
-
+
<goal name="was40:stop"
- description="Stops a websphere node">
-
- <echo>Please Wait... Stopping node</echo>
- <was40wscp:exec command="${maven.was40.stopNode}
/${maven.was40.cmd.node}:${maven.was40.node}/" />
+ description="Stops the specified websphere node.">
+ <echo>Stopping node: '${maven.was40.node}'</echo>
+ <was40wscp:exec command="${maven.was40.stopNode}" />
</goal>
-
+
<goal name="was40:list-node" description="Obtain the list of nodes on the
WebSphere Application Server">
-
- <echo>Obtaining node name ...Please Wait.</echo>
- <was40wscp:exec command="${maven.was40.listNode}" />
-
- <!-- uncomment to view results and change the above to have var="results"
- <u:tokenize var="nodeName" delim=":">${results}</u:tokenize>
- <u:tokenize var="node" delim="/">${nodeName[1]}</u:tokenize>
-
- <j:set var="maven.was40.node" value="${node[0]}" />
- <echo>variable: maven.was40.node=${maven.was40.node}</echo>
- -->
-
- </goal>
+ <echo>Retreiving a list of available Nodes...</echo>
+ <was40wscp:exec command="${maven.was40.listNode}"/>
+ </goal>
<goal name="was40:deploy-ear"
description="Deploy an enterprise application">
- <echo>Please Wait... Deploying enterprise application</echo>
- <was40wscp:exec command="${maven.was40.deployApp}" />
+ <echo>Deploying enterprise application:
'${maven.was40.enterprise.app.name}'</echo>
+ <was40wscp:exec command="${maven.was40.deployApp}" />
</goal>
-
+
<goal name="was40:app-stop"
description="Stop an enterprise application">
- <echo>Stopping enterprise application</echo>
- <was40wscp:exec command="${maven.was40.stopApp}" />
+ <echo>Stopping enterprise application:
'${maven.was40.enterprise.app.name}'</echo>
+ <was40wscp:exec command="${maven.was40.stopApp}" />
</goal>
-
+
<goal name="was40:undeploy-ear"
description="Remove an enterprise application">
-
- <echo>Please Wait... Removing enterprise application</echo>
- <was40wscp:exec command="${maven.was40.removeApp}" />
-
+ <echo>Removing enterprise application:
'${maven.was40.enterprise.app.name}'</echo>
+ <was40wscp:exec command="${maven.was40.removeApp}" />
</goal>
<goal name="was40:app-start"
description="Start enterprise application">
-
- <echo>Please Wait... Starting enterprise application</echo>
- <was40wscp:exec command="${maven.was40.startApp}" />
-
+ <echo>Starting enterprise application:
'${maven.was40.enterprise.app.name}'</echo>
+ <was40wscp:exec command="${maven.was40.startApp}" />
</goal>
-
+
<goal name="was40:deploy-to-servergroup"
description="Deploy an application to a server group">
-
- <echo>Please Wait... Deploying enterprise application to server group</echo>
- <was40wscp:exec command="${maven.was40.servergroup.install}" />
-
+ <echo>Deploying enterprise application to server group:
'${maven.was40.serverGroup.name}'</echo>
+ <was40wscp:exec command="${maven.was40.servergroup.install}" />
</goal>
<goal name="was40:start-appserver"
description="Start a websphere application server">
-
- <was40wscp:exec command="${maven.was40.appserver.start}" />
-
+ <echo>Starting Application Server: '${maven.was40.appserver.name}'</echo>
+ <was40wscp:exec command="${maven.was40.appserver.start}" />
</goal>
-
+
<goal name="was40:stop-appserver"
description="Stop a websphere application server">
-
- <was40wscp:exec command="${maven.was40.appserver.stop}" />
-
+ <echo>Stopping Application Server: '${maven.was40.appserver.name}'</echo>
+ <was40wscp:exec command="${maven.was40.appserver.stop}" />
</goal>
-
+
<goal name="was40:start-servergroup"
description="Start a websphere server group">
-
- <was40wscp:exec command="${maven.was40.servergroup.start}" />
-
+ <echo>Starting ServerGroup: '${maven.was40.serverGroup.name}'</echo>
+ <was40wscp:exec command="${maven.was40.servergroup.start}" />
</goal>
-
+
<goal name="was40:stop-servergroup"
description="Stop a websphere server group">
-
- <was40wscp:exec command="${maven.was40.servergroup.stop}" />
-
+ <echo>Stopping ServerGroup: '${maven.was40.serverGroup.name}'</echo>
+ <was40wscp:exec command="${maven.was40.servergroup.stop}" />
+ </goal>
+
+ <goal name="was40:list-apps" description="List the applications installed on this
node">
+ <echo>Obtaining a list of Enterprise applications for node:
'${maven.was40.node}'</echo>
+ <was40wscp:exec command="${maven.was40.listEnterpriseApps}" />
+ </goal>
+
+ <goal name="was40:app-show" description="Display extra information about the EAR">
+ <echo>Obtaining Details about EAR:
'${maven.was40.enterprise.app.name}'</echo>
+ <was40wscp:exec command="${maven.was40.enterpriseAppShow}" />
+ </goal>
+
+ <goal name="was40:regen" description="Regenerate the Plugin">
+ <echo>Regenerating Plugin for node: '${maven.was40.node}'</echo>
+ <exec executable="${maven.was40.plugin}" outputproperty="results">
+ <arg value="-adminNodeName" />
+ <arg value="${maven.was40.primaryNode}" />
+ <arg value="-nodeName" />
+ <arg value="${maven.was40.node}" />
+ </exec>
+ <echo>${results}</echo>
+ </goal>
+
+ <goal name="was40:jndi-dump" description="Dump the appserver's JNDI namespace">
+ <echo>Dumping [jndi] Namespace for node: '${maven.was40.node}'</echo>
+ <exec executable="${maven.was40.dumpNameSpace}"
outputproperty="result">
+ <arg value="-host" />
+ <arg value="${maven.was40.node}" />
+ <arg value="-port" />
+ <arg value="${maven.was40.hostPort}" />
+ </exec>
+ <echo>${result}</echo>
+ </goal>
+
+ <goal name="was40:expand" description="Expand EAR into the
../installedApps/appName.ear directory">
+ <echo>Expanding EAR: '${maven.was40.enterprise.app.name}' into
'${maven.was40.expandDir}/${maven.was40.enterprise.app.name}.ear'</echo>
+ <exec executable="${maven.was40.earExpander}" outputproperty="results">
+ <arg value="-ear" />
+ <arg value="${maven.was40.enterprise.app}" />
+ <arg value="-expandDir" />
+ <arg value="${maven.was40.expandDir}/${maven.was40.enterprise.app.name}.ear"
/>
+ <arg value="-operation" />
+ <arg value="expand" />
+ <arg value="-expansionFlags" />
+ <arg value="all" />
+ </exec>
+ <echo>${results}</echo>
</goal>
-
</project>
1.4 +2 -2 maven-plugins/was40/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven-plugins/was40/project.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.properties 6 Jan 2004 19:07:38 -0000 1.3
+++ project.properties 5 Feb 2004 05:50:23 -0000 1.4
@@ -1,4 +1,4 @@
maven.xdoc.date=left
-## maven.xdoc.version=${pom.currentVersion}
-maven.license.licenseFile=${basedir}/../LICENSE.txt
+maven.xdoc.version=${pom.currentVersion}
+maven.license.licenseFile=${basedir}/../../../LICENSE.txt
1.3 +7 -0 maven-plugins/was40/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/was40/plugin.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.properties 28 Apr 2003 15:31:55 -0000 1.2
+++ plugin.properties 5 Feb 2004 05:50:23 -0000 1.3
@@ -66,5 +66,12 @@
maven.was40.servergroup.list=${maven.was40.cmd.serverGroup} list
maven.was40.servergroup.show=${maven.was40.cmd.serverGroup} show
{/${maven.was40.cmd.serverGroup}:${maven.was40.serverGroup.name}/}
+#
+## Various tasks on an enterprise app level
+#
+
+maven.was40.listEnterpriseApps=${maven.was40.cmd.enterprise} list
+maven.was40.enterpriseAppShow=${maven.was40.cmd.enterprise} show
{/${maven.was40.cmd.enterprise}:${maven.was40.enterprise.app.name}/}
+
############################### Do not put these in "Quotes"
###############################
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]