Author: ptahchiev
Date: Thu Jan 10 07:23:29 2008
New Revision: 610813
URL: http://svn.apache.org/viewvc?rev=610813&view=rev
Log:
Changed the poms to add the binary zips,plus changed the plugin.xml-s to be
adequate with the project name
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-bin.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/conf/plugin.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/common/LibraryHelper.java
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/ui/CactusPlugin.java
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/src/assemble/main-bin.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/src/conf/plugin.xml
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/pom.xml?rev=610813&r1=610812&r2=610813&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/pom.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/pom.xml
Thu Jan 10 07:23:29 2008
@@ -7,7 +7,7 @@
</parent>
<name>Cactus Eclipse Integration - Webapp</name>
<packaging>jar</packaging>
- <artifactId>cactus.eclipse.runner.plugin</artifactId>
+ <artifactId>org.apache.cactus.eclipse.runner</artifactId>
<dependencies>
<dependency>
<groupId>ant</groupId>
@@ -157,18 +157,70 @@
<version>1.8.0-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.eclipse.pde</groupId>
<artifactId>ui</artifactId>
<version>[3.0.0,4.0.0)</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.eclipse.wst.xsd</groupId>
<artifactId>ui</artifactId>
<version>[1.0.0,2.0.0)</version>
</dependency>
+ <!-- Here start the dependencies that are included in the
lib/common & lib/client folders -->
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cactus</groupId>
+ <artifactId>javaEE-14-uberjar</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cactus</groupId>
+ <artifactId>integration-ant</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>0.9.1</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -176,8 +228,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
-
<descriptor>src/assemble/main-bin.xml</descriptor>
-
<descriptor>src/assemble/main-src.xml</descriptor>
+ <descriptors>
+
<descriptor>src/assemble/main-bin.xml</descriptor>
+
<descriptor>src/assemble/main-src.xml</descriptor>
+ </descriptors>
</configuration>
<executions>
<execution>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-bin.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-bin.xml?rev=610813&r1=610812&r2=610813&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-bin.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-bin.xml
Thu Jan 10 07:23:29 2008
@@ -8,7 +8,29 @@
<dependencySet>
<outputDirectory>/</outputDirectory>
<includes>
-
<include>org.apache.cactus:cactus.eclipse.runner.plugin:jar</include>
+
<include>org.apache.cactus:org.apache.cactus.eclipse.runner:jar</include>
+ </includes>
+ <unpack>false</unpack>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib/common</outputDirectory>
+ <includes>
+ <include>aspectj:aspectjrt:jar</include>
+
<include>org.apache.cactus:javaEE-14-uberjar:jar</include>
+
<include>commons-logging:commons-logging:jar</include>
+ <include>httpunit:httpunit:jar</include>
+ <include>junit:junit:jar</include>
+ <include>log4j:log4j:jar</include>
+ </includes>
+ <unpack>false</unpack>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib/client</outputDirectory>
+ <includes>
+
<include>org.apache.cactus:integration-ant:jar</include>
+
<include>commons-httpclient:commons-httpclient:jar</include>
+ <include>javax.servlet:servlet-api:jar</include>
+ <include>nekohtml:nekohtml:jar</include>
</includes>
<unpack>false</unpack>
</dependencySet>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/conf/plugin.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/conf/plugin.xml?rev=610813&r1=610812&r2=610813&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/conf/plugin.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/conf/plugin.xml
Thu Jan 10 07:23:29 2008
@@ -2,12 +2,12 @@
<plugin
id="org.apache.cactus.eclipse.runner"
name="%pluginName"
- version="0.0.0"
+ version="1.8.0"
provider-name="%providerName"
class="org.apache.cactus.eclipse.runner.ui.CactusPlugin">
<runtime>
- <library name="cactus.eclipse.runner.plugin-1.8.0-SNAPSHOT.jar">
+ <library name="org.apache.cactus.eclipse.runner-1.8.0-SNAPSHOT.jar">
<export name="*"/>
<packages prefixes="org.apache.cactus.eclipse.runner"/>
</library>
@@ -159,7 +159,7 @@
<extension
point="org.eclipse.ant.core.extraClasspathEntries">
<extraClasspathEntry
- library="cactussupportsrc.jar">
+ library="org.apache.cactus.eclipse.runner-1.8.0-SNAPSHOT-src.zip">
</extraClasspathEntry>
</extension>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/common/LibraryHelper.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/common/LibraryHelper.java?rev=610813&r1=610812&r2=610813&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/common/LibraryHelper.java
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/common/LibraryHelper.java
Thu Jan 10 07:23:29 2008
@@ -38,7 +38,7 @@
/**
* Path to the plugin's library directory
*/
- private static final String CACTUS_LIBRARY_PATH = "./lib/";
+ private static final String CACTUS_LIBRARY_PATH = "lib";
/**
* Name of the common libraries folder
@@ -73,6 +73,7 @@
private static IPath[] getClientJarPathArray()
{
File clientLibDir = getClientLibPath().toFile();
+ CactusPlugin.log("Client dir:"+clientLibDir.getAbsolutePath());
return getJarPathArray(clientLibDir);
}
@@ -152,8 +153,16 @@
private static IPath getLibPath()
{
CactusPlugin thePlugin = CactusPlugin.getDefault();
- URL antLibURL = thePlugin.find(new Path(CACTUS_LIBRARY_PATH));
- return new Path(antLibURL.getPath());
+ String plPath = "";
+ //URL antLibURL = thePlugin.getDefault().find(new
Path(CACTUS_LIBRARY_PATH));
+ try {
+ plPath =
JavaCore.getClasspathVariable("ECLIPSE_HOME").toFile().toURL().getPath()+
+
CactusPlugin.getDefault().getDescriptor().getInstallURL().getFile().replaceAll("plugin","plugins");
+ CactusPlugin.log("LIb directory"+plPath);
+ } catch(Exception ex) {
+ CactusPlugin.log(ex);
+ }
+ return new Path(plPath.concat(CACTUS_LIBRARY_PATH));
}
/**
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/ui/CactusPlugin.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/ui/CactusPlugin.java?rev=610813&r1=610812&r2=610813&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/ui/CactusPlugin.java
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/ui/CactusPlugin.java
Thu Jan 10 07:23:29 2008
@@ -80,6 +80,10 @@
super(theDescription);
plugin = this;
}
+
+ public CactusPlugin() {
+ super();
+ }
/**
* @return the single instance of this plug-in runtime class
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/pom.xml?rev=610813&r1=610812&r2=610813&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/pom.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/pom.xml
Thu Jan 10 07:23:29 2008
@@ -7,7 +7,7 @@
</parent>
<name>Cactus Eclipse Integration - Webapp</name>
<version>1.8.0-SNAPSHOT</version>
- <artifactId>cactus.eclipse.webapp.plugin</artifactId>
+ <artifactId>org.apache.cactus.eclipse.webapp</artifactId>
<packaging>jar</packaging>
<dependencies>
@@ -83,11 +83,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
-
<descriptor>src/assemble/main-bin.xml</descriptor>
-
<descriptor>src/assemble/main-src.xml</descriptor>
+ <descriptors>
+
<descriptor>src/assemble/main-src.xml</descriptor>
+
<descriptor>src/assemble/main-bin.xml</descriptor>
+ </descriptors>
</configuration>
<executions>
<execution>
+ <id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/src/assemble/main-bin.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/src/assemble/main-bin.xml?rev=610813&r1=610812&r2=610813&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/src/assemble/main-bin.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/src/assemble/main-bin.xml
Thu Jan 10 07:23:29 2008
@@ -8,7 +8,7 @@
<dependencySet>
<outputDirectory>/</outputDirectory>
<includes>
-
<include>org.apache.cactus:cactus.eclipse.webapp.plugin:jar</include>
+
<include>org.apache.cactus:org.apache.cactus.eclipse.webapp:jar</include>
</includes>
<unpack>false</unpack>
</dependencySet>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/src/conf/plugin.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/src/conf/plugin.xml?rev=610813&r1=610812&r2=610813&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/src/conf/plugin.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/org.apache.cactus.eclipse.webapp/src/conf/plugin.xml
Thu Jan 10 07:23:29 2008
@@ -2,12 +2,12 @@
<plugin
id="org.apache.cactus.eclipse.webapp"
name="%pluginName"
- version="0.0.0"
+ version="1.8.0"
provider-name="%providerName"
class="org.apache.cactus.eclipse.webapp.internal.ui.WebappPlugin">
<runtime>
- <library name="cactus.eclipse.webapp.plugin-1.8.0-SNAPSHOT.jar">
+ <library name="org.apache.cactus.eclipse.webapp-1.8.0-SNAPSHOT.jar">
<export name="*"/>
<packages prefixes="org.apache.cactus.eclipse.webapp.internal"/>
</library>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
