[jboss-svn-commits] JBL Code SVN: r13588 - in labs/jbossesb/trunk/product/tools: esbwizard/src/org/jboss/soa/esb/eclipse/util and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jul 17 18:33:49 EDT 2007
Author: kevin.conner at jboss.com
Date: 2007-07-17 18:33:49 -0400 (Tue, 17 Jul 2007)
New Revision: 13588
Added:
labs/jbossesb/trunk/product/tools/updatesite/features/org.jboss.soa.esb.template_1.1.1.jar
labs/jbossesb/trunk/product/tools/updatesite/plugins/org.jboss.soa.esb.eclipse.template_1.1.1.jar
Modified:
labs/jbossesb/trunk/product/tools/esbwizard/META-INF/MANIFEST.MF
labs/jbossesb/trunk/product/tools/esbwizard/src/org/jboss/soa/esb/eclipse/util/ESBUtils.java
labs/jbossesb/trunk/product/tools/esbwizard/template/src/org/jboss/soa/esb/samples/quickstart/helloworld/MyJMSListenerAction.java
labs/jbossesb/trunk/product/tools/esbwizard/template/src/org/jboss/soa/esb/samples/quickstart/helloworld/test/SendEsbMessage.java
labs/jbossesb/trunk/product/tools/updatesite/site.xml
Log:
Updated esbwizard to remove duplicate jars and template deprecation warnings: JBESB-714
Modified: labs/jbossesb/trunk/product/tools/esbwizard/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossesb/trunk/product/tools/esbwizard/META-INF/MANIFEST.MF 2007-07-17 21:19:11 UTC (rev 13587)
+++ labs/jbossesb/trunk/product/tools/esbwizard/META-INF/MANIFEST.MF 2007-07-17 22:33:49 UTC (rev 13588)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Esbwizard Plug-in
Bundle-SymbolicName: org.jboss.soa.esb.eclipse.template; singleton:=true
-Bundle-Version: 1.1.0
+Bundle-Version: 1.1.1
Bundle-Activator: org.jboss.soa.esb.eclipse.template.Activator
Bundle-Vendor: JBoss
Bundle-Localization: plugin
Modified: labs/jbossesb/trunk/product/tools/esbwizard/src/org/jboss/soa/esb/eclipse/util/ESBUtils.java
===================================================================
--- labs/jbossesb/trunk/product/tools/esbwizard/src/org/jboss/soa/esb/eclipse/util/ESBUtils.java 2007-07-17 21:19:11 UTC (rev 13587)
+++ labs/jbossesb/trunk/product/tools/esbwizard/src/org/jboss/soa/esb/eclipse/util/ESBUtils.java 2007-07-17 22:33:49 UTC (rev 13588)
@@ -21,7 +21,9 @@
package org.jboss.soa.esb.eclipse.util;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.filesystem.IFileInfo;
@@ -252,12 +254,13 @@
throws CoreException
{
final ArrayList classpathEntries = new ArrayList() ;
+ final HashSet jarEntries = new HashSet() ;
final IPath esbLocationPath = Path.fromOSString(esbLocation) ;
final IPath deployPath = esbLocationPath.append("server/default/deploy") ;
- addSARArtifactJars(classpathEntries, deployPath, ESB_SAR) ;
- addESBArtifactJars(classpathEntries, deployPath, ESB_ARTIFACTS) ;
- addClientJars(classpathEntries, esbLocationPath) ;
+ addSARArtifactJars(classpathEntries, jarEntries, deployPath, ESB_SAR) ;
+ addESBArtifactJars(classpathEntries, jarEntries, deployPath, ESB_ARTIFACTS) ;
+ addClientJars(classpathEntries, jarEntries, esbLocationPath) ;
return (IClasspathEntry[]) classpathEntries.toArray(new IClasspathEntry[classpathEntries.size()]) ;
}
@@ -273,13 +276,14 @@
throws CoreException
{
final ArrayList classpathEntries = new ArrayList() ;
+ final HashSet jarEntries = new HashSet() ;
final IPath esbLocationPath = Path.fromOSString(esbLocation) ;
final IPath asLocationPath = Path.fromOSString(asLocation) ;
final IPath esbLibPath = esbLocationPath.append("lib") ;
- addSARArtifactJars(classpathEntries, esbLibPath, ESB_SAR) ;
- addESBArtifactJars(classpathEntries, esbLibPath, ESB_ARTIFACTS) ;
- addClientJars(classpathEntries, asLocationPath) ;
+ addSARArtifactJars(classpathEntries, jarEntries, esbLibPath, ESB_SAR) ;
+ addESBArtifactJars(classpathEntries, jarEntries, esbLibPath, ESB_ARTIFACTS) ;
+ addClientJars(classpathEntries, jarEntries, asLocationPath) ;
return (IClasspathEntry[]) classpathEntries.toArray(new IClasspathEntry[classpathEntries.size()]) ;
}
@@ -287,53 +291,57 @@
/**
* Add the SAR artifact jars to the classpath.
* @param classpathEntries The current classpath list.
+ * @param jarEntries The set of jars already added.
* @param parent The parent of the sar artifact.
* @param sarArtifact The name of the sar artifact.
* @throws CoreException for errors.
*/
- private static void addSARArtifactJars(final List classpathEntries, final IPath parent, final String sarArtifact)
+ private static void addSARArtifactJars(final List classpathEntries, final Set jarEntries, final IPath parent, final String sarArtifact)
throws CoreException
{
final IPath sarLibPath = parent.append(sarArtifact + "/lib") ;
- addAllJars(classpathEntries, sarLibPath) ;
+ addAllJars(classpathEntries, jarEntries, sarLibPath) ;
}
/**
* Add the ESB artifact jars to the classpath.
* @param classpathEntries The current classpath list.
+ * @param jarEntries The set of jars already added.
* @param parent The parent of the ESB artifacts.
* @param esbArtifacts The names of the esb artifacts.
* @throws CoreException for errors.
*/
- private static void addESBArtifactJars(final List classpathEntries, final IPath parent, final String[] esbArtifacts)
+ private static void addESBArtifactJars(final List classpathEntries, final Set jarEntries, final IPath parent, final String[] esbArtifacts)
throws CoreException
{
final int numArtifacts = (esbArtifacts == null ? 0 : esbArtifacts.length) ;
for(int count = 0 ; count < numArtifacts ; count++)
{
final IPath artifactPath = parent.append(esbArtifacts[count]) ;
- addAllJars(classpathEntries, artifactPath) ;
+ addAllJars(classpathEntries, jarEntries, artifactPath) ;
}
}
/**
* Add the App Server client jars to the classpath.
* @param classpathEntries The current classpath list.
+ * @param jarEntries The set of jars already added.
* @param asRoot The root of the app server install.
*/
- private static void addClientJars(final List classpathEntries, final IPath asRoot)
+ private static void addClientJars(final List classpathEntries, final Set jarEntries, final IPath asRoot)
{
final IPath clientJarPath = asRoot.append("client/jbossall-client.jar") ;
- classpathEntries.add(JavaCore.newLibraryEntry(clientJarPath, null, null)) ;
+ addEntry(classpathEntries, jarEntries, clientJarPath) ;
}
/**
* Add all jars in the specified directory.
* @param classpathEntries The current classpath list.
+ * @param jarEntries The set of jars already added.
* @param directory The directory containing the jars.
* @throws CoreException for errors.
*/
- private static void addAllJars(final List classpathEntries, final IPath root)
+ private static void addAllJars(final List classpathEntries, final Set jarEntries, final IPath root)
throws CoreException
{
final IFileStore rootStore = EFS.getLocalFileSystem().getStore(root) ;
@@ -349,9 +357,24 @@
if (childInfo.exists() && !childInfo.isDirectory())
{
final IPath childPath = root.append(child) ;
- classpathEntries.add(JavaCore.newLibraryEntry(childPath, null, null)) ;
+ addEntry(classpathEntries, jarEntries, childPath) ;
}
}
}
}
+
+ /**
+ * Add the jar entry to the classpath, checking for duplicates.
+ * @param classpathEntries The current classpath list.
+ * @param jarEntries The set of jars already added.
+ * @param jarPath The current jar to add.
+ */
+ private static void addEntry(final List classpathEntries, final Set jarEntries, final IPath jarPath)
+ {
+ final String jarName = jarPath.lastSegment() ;
+ if (jarEntries.add(jarName))
+ {
+ classpathEntries.add(JavaCore.newLibraryEntry(jarPath, null, null)) ;
+ }
+ }
}
Modified: labs/jbossesb/trunk/product/tools/esbwizard/template/src/org/jboss/soa/esb/samples/quickstart/helloworld/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/trunk/product/tools/esbwizard/template/src/org/jboss/soa/esb/samples/quickstart/helloworld/MyJMSListenerAction.java 2007-07-17 21:19:11 UTC (rev 13587)
+++ labs/jbossesb/trunk/product/tools/esbwizard/template/src/org/jboss/soa/esb/samples/quickstart/helloworld/MyJMSListenerAction.java 2007-07-17 22:33:49 UTC (rev 13588)
@@ -35,7 +35,7 @@
public Message displayMessage(Message message) throws Exception{
System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
- System.out.println("Body: " + new String(message.getBody().getContents()));
+ System.out.println("Body: " + new String(message.getBody().getByteArray()));
System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
return message;
Modified: labs/jbossesb/trunk/product/tools/esbwizard/template/src/org/jboss/soa/esb/samples/quickstart/helloworld/test/SendEsbMessage.java
===================================================================
--- labs/jbossesb/trunk/product/tools/esbwizard/template/src/org/jboss/soa/esb/samples/quickstart/helloworld/test/SendEsbMessage.java 2007-07-17 21:19:11 UTC (rev 13587)
+++ labs/jbossesb/trunk/product/tools/esbwizard/template/src/org/jboss/soa/esb/samples/quickstart/helloworld/test/SendEsbMessage.java 2007-07-17 22:33:49 UTC (rev 13588)
@@ -55,7 +55,7 @@
esbMessage.getHeader().setCall(call);
// set body contents with args[2], and send
- esbMessage.getBody().setContents(args[2].getBytes());
+ esbMessage.getBody().setByteArray(args[2].getBytes());
ListenerUtil.tryToDeliver(esbMessage, args[0], args[1]);
Added: labs/jbossesb/trunk/product/tools/updatesite/features/org.jboss.soa.esb.template_1.1.1.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/tools/updatesite/features/org.jboss.soa.esb.template_1.1.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/tools/updatesite/plugins/org.jboss.soa.esb.eclipse.template_1.1.1.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/tools/updatesite/plugins/org.jboss.soa.esb.eclipse.template_1.1.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossesb/trunk/product/tools/updatesite/site.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/updatesite/site.xml 2007-07-17 21:19:11 UTC (rev 13587)
+++ labs/jbossesb/trunk/product/tools/updatesite/site.xml 2007-07-17 22:33:49 UTC (rev 13588)
@@ -6,5 +6,8 @@
<feature url="features/org.jboss.soa.esb.template_1.1.0.jar" id="org.jboss.soa.esb.template" version="1.1.0">
<category name="org.jboss.soa.esb.template"/>
</feature>
+ <feature url="features/org.jboss.soa.esb.template_1.1.1.jar" id="org.jboss.soa.esb.template" version="1.1.1">
+ <category name="org.jboss.soa.esb.template"/>
+ </feature>
<category-def name="org.jboss.soa.esb.template" label="JBoss ESB Template"/>
</site>
More information about the jboss-svn-commits
mailing list