[savara-commits] savara SVN: r32 - in trunk/tools/eclipse/plugins: org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel and 11 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Oct 2 15:43:11 EDT 2009


Author: objectiser
Date: 2009-10-02 15:43:10 -0400 (Fri, 02 Oct 2009)
New Revision: 32

Added:
   trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/osgi/
   trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/osgi/
   trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/osgi/Activator.java
   trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/osgi/JBossESBValidatorAnnotations.java
   trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/osgi/
Removed:
   trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/eclipse/
   trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/Activator.java
   trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/JBossESBValidatorAnnotations.java
   trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/eclipse/
Modified:
   trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/META-INF/MANIFEST.MF
   trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/dialogs/GenerateDialog.java
   trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/osgi/Activator.java
   trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/META-INF/MANIFEST.MF
   trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/plugin.xml
   trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/META-INF/MANIFEST.MF
   trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java
   trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/osgi/Activator.java
Log:
Refactored plugin package in line with scribble plugins.

Modified: trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/META-INF/MANIFEST.MF
===================================================================
--- trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/META-INF/MANIFEST.MF	2009-09-23 17:15:11 UTC (rev 31)
+++ trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/META-INF/MANIFEST.MF	2009-10-02 19:43:10 UTC (rev 32)
@@ -3,7 +3,7 @@
 Bundle-Name: JBoss SAVARA Tools BPEL Plug-in
 Bundle-SymbolicName: org.jboss.savara.tools.bpel;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.jboss.savara.tools.bpel.eclipse.Activator
+Bundle-Activator: org.jboss.savara.tools.bpel.osgi.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.scribble.conversation.model,

Modified: trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/dialogs/GenerateDialog.java
===================================================================
--- trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/dialogs/GenerateDialog.java	2009-09-23 17:15:11 UTC (rev 31)
+++ trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/dialogs/GenerateDialog.java	2009-10-02 19:43:10 UTC (rev 32)
@@ -358,7 +358,7 @@
 	 */
 	public void error(String mesg, Exception ex) {
 		
-		org.jboss.savara.tools.bpel.eclipse.Activator.logError(mesg, ex);
+		org.jboss.savara.tools.bpel.osgi.Activator.logError(mesg, ex);
 		
 		MessageBox mbox=new MessageBox(getShell(),
 				SWT.ICON_ERROR|SWT.OK);

Copied: trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/osgi (from rev 17, trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/eclipse)

Modified: trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/osgi/Activator.java
===================================================================
--- trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/eclipse/Activator.java	2009-09-07 12:32:04 UTC (rev 17)
+++ trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/osgi/Activator.java	2009-10-02 19:43:10 UTC (rev 32)
@@ -1,4 +1,4 @@
-package org.jboss.savara.tools.bpel.eclipse;
+package org.jboss.savara.tools.bpel.osgi;
 
 import org.apache.commons.logging.*;
 import org.eclipse.core.runtime.IStatus;

Modified: trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/META-INF/MANIFEST.MF
===================================================================
--- trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/META-INF/MANIFEST.MF	2009-09-23 17:15:11 UTC (rev 31)
+++ trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/META-INF/MANIFEST.MF	2009-10-02 19:43:10 UTC (rev 32)
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.jboss.savara.tools.jbossesb;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
-Bundle-Activator: org.jboss.savara.tools.jbossesb.eclipse.Activator
+Bundle-Activator: org.jboss.savara.tools.jbossesb.osgi.Activator
 Bundle-Vendor: www.jboss.org
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

Modified: trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java
===================================================================
--- trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java	2009-09-23 17:15:11 UTC (rev 31)
+++ trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java	2009-10-02 19:43:10 UTC (rev 32)
@@ -382,7 +382,7 @@
 	 */
 	public void error(String mesg, Exception ex) {
 		
-		org.jboss.savara.tools.jbossesb.eclipse.Activator.logError(mesg, ex);
+		org.jboss.savara.tools.jbossesb.osgi.Activator.logError(mesg, ex);
 		
 		MessageBox mbox=new MessageBox(getShell(),
 				SWT.ICON_ERROR|SWT.OK);

Copied: trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/osgi (from rev 17, trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/eclipse)

Modified: trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/osgi/Activator.java
===================================================================
--- trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/eclipse/Activator.java	2009-09-07 12:32:04 UTC (rev 17)
+++ trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/osgi/Activator.java	2009-10-02 19:43:10 UTC (rev 32)
@@ -15,7 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.savara.tools.jbossesb.eclipse;
+package org.jboss.savara.tools.jbossesb.osgi;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;

Modified: trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/META-INF/MANIFEST.MF
===================================================================
--- trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/META-INF/MANIFEST.MF	2009-09-23 17:15:11 UTC (rev 31)
+++ trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/META-INF/MANIFEST.MF	2009-10-02 19:43:10 UTC (rev 32)
@@ -3,7 +3,7 @@
 Bundle-Name: JBoss SAVARA Tools JBossESB CDL Plug-in
 Bundle-SymbolicName: org.jboss.savara.tools.jbossesb.cdl;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.jboss.savara.tools.jbossesb.cdl.eclipse.Activator
+Bundle-Activator: org.jboss.savara.tools.jbossesb.cdl.osgi.Activator
 Bundle-Vendor: www.jboss.org
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

Modified: trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/plugin.xml
===================================================================
--- trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/plugin.xml	2009-09-23 17:15:11 UTC (rev 31)
+++ trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/plugin.xml	2009-10-02 19:43:10 UTC (rev 32)
@@ -4,7 +4,7 @@
    <extension
          point="org.pi4soa.common.annotationsManager">
       <annotationsManager
-            class="org.jboss.savara.tools.jbossesb.cdl.eclipse.JBossESBValidatorAnnotations">
+            class="org.jboss.savara.tools.jbossesb.cdl.osgi.JBossESBValidatorAnnotations">
       </annotationsManager>
    </extension>
 

Deleted: trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/Activator.java
===================================================================
--- trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/Activator.java	2009-09-23 17:15:11 UTC (rev 31)
+++ trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/Activator.java	2009-10-02 19:43:10 UTC (rev 32)
@@ -1,74 +0,0 @@
-package org.jboss.savara.tools.jbossesb.cdl.eclipse;
-
-import java.util.logging.Logger;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.jboss.savara.tools.jbossesb.cdl";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * This method logs an error against the plugin.
-	 * 
-	 * @param mesg The error message
-	 * @param t The optional exception
-	 */
-	public static void logError(String mesg, Throwable t) {
-		
-		if (getDefault() != null) {
-			Status status=new Status(IStatus.ERROR,
-					PLUGIN_ID, 0, mesg, t);
-			
-			getDefault().getLog().log(status);
-		}
-		
-		logger.severe("LOG ERROR: "+mesg+
-				(t == null ? "" : ": "+t));
-	}
-	
-	private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.cdl.eclipse");
-}

Deleted: trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/JBossESBValidatorAnnotations.java
===================================================================
--- trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/JBossESBValidatorAnnotations.java	2009-09-23 17:15:11 UTC (rev 31)
+++ trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/JBossESBValidatorAnnotations.java	2009-10-02 19:43:10 UTC (rev 32)
@@ -1,72 +0,0 @@
-/*
- * Copyright 2005-8 Pi4 Technologies Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- * Change History:
- * 21 Oct 2008 : Initial version created by gary
- */
-package org.jboss.savara.tools.jbossesb.cdl.eclipse;
-
-import java.net.URL;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.pi4soa.common.annotations.eclipse.EclipseAnnotationsManager;
-
-/**
- * This class implements the AnnotationsManager extension point.
- */
-public class JBossESBValidatorAnnotations extends EclipseAnnotationsManager {
-
-	public JBossESBValidatorAnnotations() {
-		super(Activator.PLUGIN_ID);
-	}
-	
-	/**
-	 * This method returns an input stream associated with the
-	 * supplied URL. The URL can also reference a local relative
-	 * file path.
-	 * 
-	 * @param url The URL, or relative file path
-	 * @return The input stream
-	 */
-	protected java.io.InputStream getInputStream(String url) {
-		java.io.InputStream ret=null;
-		
-		try {
-			String path=ANNOTATIONS_FOLDER +
-						"/" + url;
-
-			logger.fine("Load from path: "+path);
-
-			ret = JBossESBValidatorAnnotations.class.getResourceAsStream(path);
-
-		} catch(Exception e) {
-			logger.severe("Failed to get input stream for URL '"+
-					url+"': "+e);
-		}
-
-		if (logger.isLoggable(Level.FINEST)) {
-			logger.finest("Ret="+ret);
-		}
-		
-		return(ret);
-	}
-	
-    private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.cdl.eclipse");
-
-	private static final String	ANNOTATIONS_FOLDER="annotations";
-    private static final String PATH_SEPARATOR = "/";
-}

Copied: trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/osgi/Activator.java (from rev 17, trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/Activator.java)
===================================================================
--- trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/osgi/Activator.java	                        (rev 0)
+++ trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/osgi/Activator.java	2009-10-02 19:43:10 UTC (rev 32)
@@ -0,0 +1,74 @@
+package org.jboss.savara.tools.jbossesb.cdl.osgi;
+
+import java.util.logging.Logger;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.jboss.savara.tools.jbossesb.cdl";
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * This method logs an error against the plugin.
+	 * 
+	 * @param mesg The error message
+	 * @param t The optional exception
+	 */
+	public static void logError(String mesg, Throwable t) {
+		
+		if (getDefault() != null) {
+			Status status=new Status(IStatus.ERROR,
+					PLUGIN_ID, 0, mesg, t);
+			
+			getDefault().getLog().log(status);
+		}
+		
+		logger.severe("LOG ERROR: "+mesg+
+				(t == null ? "" : ": "+t));
+	}
+	
+	private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.cdl.eclipse");
+}

Copied: trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/osgi/JBossESBValidatorAnnotations.java (from rev 17, trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/eclipse/JBossESBValidatorAnnotations.java)
===================================================================
--- trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/osgi/JBossESBValidatorAnnotations.java	                        (rev 0)
+++ trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/src/java/org/jboss/savara/tools/jbossesb/cdl/osgi/JBossESBValidatorAnnotations.java	2009-10-02 19:43:10 UTC (rev 32)
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2005-8 Pi4 Technologies Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ * Change History:
+ * 21 Oct 2008 : Initial version created by gary
+ */
+package org.jboss.savara.tools.jbossesb.cdl.osgi;
+
+import java.net.URL;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.pi4soa.common.annotations.eclipse.EclipseAnnotationsManager;
+
+/**
+ * This class implements the AnnotationsManager extension point.
+ */
+public class JBossESBValidatorAnnotations extends EclipseAnnotationsManager {
+
+	public JBossESBValidatorAnnotations() {
+		super(Activator.PLUGIN_ID);
+	}
+	
+	/**
+	 * This method returns an input stream associated with the
+	 * supplied URL. The URL can also reference a local relative
+	 * file path.
+	 * 
+	 * @param url The URL, or relative file path
+	 * @return The input stream
+	 */
+	protected java.io.InputStream getInputStream(String url) {
+		java.io.InputStream ret=null;
+		
+		try {
+			String path=ANNOTATIONS_FOLDER +
+						"/" + url;
+
+			logger.fine("Load from path: "+path);
+
+			ret = JBossESBValidatorAnnotations.class.getResourceAsStream(path);
+
+		} catch(Exception e) {
+			logger.severe("Failed to get input stream for URL '"+
+					url+"': "+e);
+		}
+
+		if (logger.isLoggable(Level.FINEST)) {
+			logger.finest("Ret="+ret);
+		}
+		
+		return(ret);
+	}
+	
+    private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.cdl.osgi");
+
+	private static final String	ANNOTATIONS_FOLDER="annotations";
+    private static final String PATH_SEPARATOR = "/";
+}



More information about the savara-commits mailing list