diff --git a/org.talend.libraries.apache.axis2/.classpath b/org.talend.libraries.apache.axis2/.classpath index e6265bac9c..06a92d7897 100644 --- a/org.talend.libraries.apache.axis2/.classpath +++ b/org.talend.libraries.apache.axis2/.classpath @@ -1,18 +1,18 @@ - - - - - - - + + + + + + - + - + + diff --git a/org.talend.libraries.apache.axis2/META-INF/MANIFEST.MF b/org.talend.libraries.apache.axis2/META-INF/MANIFEST.MF index 6b44516e2e..451dff9075 100644 --- a/org.talend.libraries.apache.axis2/META-INF/MANIFEST.MF +++ b/org.talend.libraries.apache.axis2/META-INF/MANIFEST.MF @@ -3,26 +3,24 @@ Bundle-ManifestVersion: 2 Bundle-Name: Axis2 Bundle-SymbolicName: org.talend.libraries.apache.axis2 Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.talend.libraries.apache.axis2.Activator Require-Bundle: org.eclipse.core.runtime, org.apache.commons.httpclient, javax.wsdl, org.talend.libraries.apache -Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: lib/activation-1.1.jar, - lib/axiom-api-1.2.9.jar, - lib/axiom-impl-1.2.9.jar, - lib/axis2-adb-1.5.2.jar, - lib/axis2-kernel-1.5.2.jar, - lib/axis2-transport-http-1.5.2.jar, - lib/axis2-transport-local-1.5.2.jar, + lib/axiom-api-1.2.13.jar, + lib/axiom-impl-1.2.13.jar, + lib/axis2-adb-1.6.2.jar, + lib/axis2-kernel-1.6.2.jar, + lib/axis2-transport-http-1.6.2.jar, + lib/axis2-transport-local-1.6.2.jar, lib/geronimo-stax-api_1.0_spec-1.0.1.jar, - lib/httpcore-4.0.jar, + lib/httpcore-4.0.1.jar, lib/mail-1.4.jar, - lib/neethi-2.0.4.jar, + lib/neethi-3.0.1.jar, lib/wstx-asl-3.2.9.jar, - lib/XmlSchema-1.4.5.jar, + lib/xmlschema-core-2.0.1.jar, . Export-Package: com.ctc.wstx.api, com.ctc.wstx.cfg, @@ -66,9 +64,13 @@ Export-Package: com.ctc.wstx.api, org.apache.axiom.ext.io, org.apache.axiom.ext.stax, org.apache.axiom.ext.stax.datahandler, + org.apache.axiom.locator, + org.apache.axiom.locator.loader, org.apache.axiom.mime, + org.apache.axiom.mime.impl.axiom, org.apache.axiom.mime.impl.javamail, org.apache.axiom.om, + org.apache.axiom.om.dom, org.apache.axiom.om.ds, org.apache.axiom.om.ds.custombuilder, org.apache.axiom.om.impl, @@ -83,7 +85,6 @@ Export-Package: com.ctc.wstx.api, org.apache.axiom.om.impl.util, org.apache.axiom.om.util, org.apache.axiom.om.xpath, - org.apache.axiom.osgi, org.apache.axiom.soap, org.apache.axiom.soap.impl.builder, org.apache.axiom.soap.impl.llom, @@ -94,6 +95,7 @@ Export-Package: com.ctc.wstx.api, org.apache.axiom.util.base64, org.apache.axiom.util.blob, org.apache.axiom.util.namespace, + org.apache.axiom.util.sax, org.apache.axiom.util.stax, org.apache.axiom.util.stax.debug, org.apache.axiom.util.stax.dialect, @@ -110,8 +112,8 @@ Export-Package: com.ctc.wstx.api, org.apache.axis2.client, org.apache.axis2.client.async, org.apache.axis2.clustering, - org.apache.axis2.clustering.configuration, - org.apache.axis2.clustering.context, + org.apache.axis2.clustering.management, + org.apache.axis2.clustering.state, org.apache.axis2.context, org.apache.axis2.context.externalize, org.apache.axis2.databinding, @@ -138,6 +140,8 @@ Export-Package: com.ctc.wstx.api, org.apache.axis2.handlers, org.apache.axis2.i18n, org.apache.axis2.java.security, + org.apache.axis2.jaxrs, + org.apache.axis2.jsr181, org.apache.axis2.modules, org.apache.axis2.namespace, org.apache.axis2.phaseresolver, @@ -169,16 +173,17 @@ Export-Package: com.ctc.wstx.api, org.apache.http.util, org.apache.neethi, org.apache.neethi.builders, + org.apache.neethi.builders.converters, org.apache.neethi.builders.xml, org.apache.neethi.util, org.apache.ws.commons.schema, org.apache.ws.commons.schema.constants, org.apache.ws.commons.schema.extensions, + org.apache.ws.commons.schema.internal, org.apache.ws.commons.schema.resolver, org.apache.ws.commons.schema.utils, org.codehaus.stax2, org.codehaus.stax2.evt, org.codehaus.stax2.io, org.codehaus.stax2.ri, - org.codehaus.stax2.validation, - org.talend.libraries.apache.axis2 + org.codehaus.stax2.validation diff --git a/org.talend.libraries.apache.axis2/build.properties b/org.talend.libraries.apache.axis2/build.properties index 80f15d88d0..3f714f8385 100644 --- a/org.talend.libraries.apache.axis2/build.properties +++ b/org.talend.libraries.apache.axis2/build.properties @@ -1,17 +1,15 @@ -source.. = src/main/java/ output.. = class/ bin.includes = META-INF/,\ - .,\ lib/activation-1.1.jar,\ - lib/axiom-api-1.2.9.jar,\ - lib/axiom-impl-1.2.9.jar,\ - lib/axis2-adb-1.5.2.jar,\ - lib/axis2-kernel-1.5.2.jar,\ - lib/axis2-transport-http-1.5.2.jar,\ - lib/axis2-transport-local-1.5.2.jar,\ + lib/axiom-api-1.2.13.jar,\ + lib/axiom-impl-1.2.13.jar,\ + lib/axis2-adb-1.6.2.jar,\ + lib/axis2-kernel-1.6.2.jar,\ + lib/axis2-transport-http-1.6.2.jar,\ + lib/axis2-transport-local-1.6.2.jar,\ lib/geronimo-stax-api_1.0_spec-1.0.1.jar,\ - lib/httpcore-4.0.jar,\ + lib/httpcore-4.0.1.jar,\ lib/mail-1.4.jar,\ - lib/neethi-2.0.4.jar,\ + lib/neethi-3.0.1.jar,\ lib/wstx-asl-3.2.9.jar,\ - lib/XmlSchema-1.4.5.jar + lib/xmlschema-core-2.0.1.jar diff --git a/org.talend.libraries.apache.axis2/lib/castor-1.0.3.jar.REMOVED.git-id b/org.talend.libraries.apache.axis2/lib/castor-1.0.3.jar.REMOVED.git-id deleted file mode 100644 index 836d39436b..0000000000 --- a/org.talend.libraries.apache.axis2/lib/castor-1.0.3.jar.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -3243fc3e1edcf35fb116d6a000828659d950c72e \ No newline at end of file diff --git a/org.talend.libraries.apache.axis2/lib/xmlbeans-2.3.0.jar.REMOVED.git-id b/org.talend.libraries.apache.axis2/lib/xmlbeans-2.3.0.jar.REMOVED.git-id deleted file mode 100644 index 3a94409041..0000000000 --- a/org.talend.libraries.apache.axis2/lib/xmlbeans-2.3.0.jar.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -ccd8163421ba8d0361315fb947f2432f1e6d7a83 \ No newline at end of file diff --git a/org.talend.libraries.apache.axis2/src/main/java/org/talend/libraries/apache/axis2/Activator.java b/org.talend.libraries.apache.axis2/src/main/java/org/talend/libraries/apache/axis2/Activator.java deleted file mode 100644 index e9cda21c97..0000000000 --- a/org.talend.libraries.apache.axis2/src/main/java/org/talend/libraries/apache/axis2/Activator.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.talend.libraries.apache.axis2; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class Activator implements BundleActivator { - - private static BundleContext context; - - static BundleContext getContext() { - return context; - } - - /* - * (non-Javadoc) - * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext bundleContext) throws Exception { - Activator.context = bundleContext; - } - - /* - * (non-Javadoc) - * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext bundleContext) throws Exception { - Activator.context = null; - } - -} diff --git a/org.talend.metadata.managment.ui/src/main/java/org/talend/repository/ui/wizards/metadata/connection/files/salesforce/SalesforceStep1Form.java b/org.talend.metadata.managment.ui/src/main/java/org/talend/repository/ui/wizards/metadata/connection/files/salesforce/SalesforceStep1Form.java index c662e04d77..91c530f204 100644 --- a/org.talend.metadata.managment.ui/src/main/java/org/talend/repository/ui/wizards/metadata/connection/files/salesforce/SalesforceStep1Form.java +++ b/org.talend.metadata.managment.ui/src/main/java/org/talend/repository/ui/wizards/metadata/connection/files/salesforce/SalesforceStep1Form.java @@ -12,10 +12,7 @@ // ============================================================================ package org.talend.repository.ui.wizards.metadata.connection.files.salesforce; -import java.util.ArrayList; -import java.util.List; import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -31,8 +28,6 @@ import org.talend.commons.ui.swt.formtools.Form; import org.talend.commons.ui.swt.formtools.LabelledText; import org.talend.commons.ui.swt.formtools.UtilsButton; import org.talend.core.model.metadata.IMetadataContextModeManager; -import org.talend.core.model.process.IElementParameter; -import org.talend.core.model.process.INode; import org.talend.core.model.properties.ConnectionItem; import org.talend.core.runtime.CoreRuntimePlugin; import org.talend.metadata.managment.ui.i18n.Messages; @@ -314,11 +309,6 @@ public class SalesforceStep1Form extends AbstractSalesforceStepForm { getConnection().setUseProxy(false); useProxyBtn.setSelection(false); } - - MessageDialog messageDialog = new MessageDialog(getShell(), "Restare", null, //$NON-NLS-1$ - "If you have modified the http set,you have to restare the system!", MessageDialog.INFORMATION, - new String[] { "OK" }, 0); - messageDialog.open(); } }); proxyHostText.addModifyListener(new ModifyListener() {