5:01 p.m.
Author: objectiser
Date: 2010-03-23 18:01:18 -0400 (Tue, 23 Mar 2010)
New Revision: 210
Modified:
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/build.properties
tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl/META-INF/MANIFEST.MF
tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl/build.properties
tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/osgi/Activator.java
Log:
Fix distribution issue not making the wsdl plugin available.
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/build.properties
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/build.properties 2010-03-22
20:34:38 UTC (rev 209)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/build.properties 2010-03-23
22:01:18 UTC (rev 210)
@@ -2,4 +2,12 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ Copyright.txt
+src.includes = src/,\
+ plugin.xml,\
+ build.properties,\
+ META-INF/,\
+ Copyright.txt,\
+ .project,\
+ .classpath
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl/META-INF/MANIFEST.MF
===================================================================
---
tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl/META-INF/MANIFEST.MF 2010-03-22
20:34:38 UTC (rev 209)
+++
tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl/META-INF/MANIFEST.MF 2010-03-23
22:01:18 UTC (rev 210)
@@ -4,13 +4,12 @@
Bundle-SymbolicName: org.jboss.savara.tools.wsdl;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.jboss.savara.tools.wsdl.osgi.Activator
-Import-Package: org.osgi.framework;version="1.3.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: www.jboss.org
-Require-Bundle: javax.wsdl;bundle-version="1.5.1";visibility:=reexport,
- org.scribble.contract.model;bundle-version="0.1.0",
- org.apache.commons.logging;bundle-version="1.0.4",
- org.scribble.core;bundle-version="0.1.0",
+Require-Bundle: javax.wsdl;visibility:=reexport,
+ org.scribble.contract.model,
+ org.apache.commons.logging,
+ org.scribble.core,
org.eclipse.core.resources,
org.eclipse.jface,
org.eclipse.ui,
@@ -19,3 +18,4 @@
org.scribble.conversation.model
Export-Package: org.jboss.savara.tools.wsdl.generator,
org.jboss.savara.tools.wsdl.generator.soap
+Bundle-ActivationPolicy: lazy
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl/build.properties
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl/build.properties 2010-03-22
20:34:38 UTC (rev 209)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl/build.properties 2010-03-23
22:01:18 UTC (rev 210)
@@ -1,4 +1,14 @@
source.. = src/java/
output.. = classes/
bin.includes = META-INF/,\
- .
+ .,\
+ plugin.xml,\
+ build.properties,\
+ Copyright.txt
+src.includes = .classpath,\
+ .project,\
+ Copyright.txt,\
+ META-INF/,\
+ build.properties,\
+ plugin.xml,\
+ src/
Modified:
tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/osgi/Activator.java
===================================================================
---
tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/osgi/Activator.java 2010-03-22
20:34:38 UTC (rev 209)
+++
tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/osgi/Activator.java 2010-03-23
22:01:18 UTC (rev 210)
@@ -1,39 +1,73 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.savara.tools.wsdl.osgi;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
- /*
- * (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- }
-
- /*
- * (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- }
-
-}
+package org.jboss.savara.tools.wsdl.osgi;
+
+import org.apache.commons.logging.*;
+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.wsdl";
+
+ // 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.error("LOG ERROR: "+mesg+
+ (t == null ? "" : ": "+t), t);
+ }
+
+ private static Log logger = LogFactory.getLog(Activator.class);
+}