JBoss Tools SVN: r36733 - in workspace/bfitzpat: org.jboss.tools.uddi.core and 21 other directories.
by jbosstools-commits@lists.jboss.org
Author: bfitzpat
Date: 2011-11-29 10:10:53 -0500 (Tue, 29 Nov 2011)
New Revision: 36733
Added:
workspace/bfitzpat/.project
workspace/bfitzpat/org.jboss.tools.uddi.core/
workspace/bfitzpat/org.jboss.tools.uddi.core/.classpath
workspace/bfitzpat/org.jboss.tools.uddi.core/.project
workspace/bfitzpat/org.jboss.tools.uddi.core/.settings/
workspace/bfitzpat/org.jboss.tools.uddi.core/.settings/org.eclipse.jdt.core.prefs
workspace/bfitzpat/org.jboss.tools.uddi.core/build.properties
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/XmlSchema-1.4.7.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/commons-collections-3.2.1.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/commons-configuration-1.5.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/commons-lang-2.3.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/commons-logging-1.1.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-api-2.3.1.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-common-utilities-2.3.1.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-bindings-soap-2.3.1.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-core-2.3.1.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-databinding-jaxb-2.3.1.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-frontend-jaxws-2.3.1.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-frontend-simple-2.3.1.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-transports-http-2.3.1.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-ws-addr-2.3.1.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-tools-common-2.3.1.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/jaxr-api-1.0.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/juddi-client-3.1.3-SNAPSHOT.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/juddi-client-extras-3.1.3-SNAPSHOT.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/juddi-core-3.1.3-SNAPSHOT.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/log4j-1.2.12.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/neethi-2.0.4.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/uddi-ws-3.1.3-SNAPSHOT.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/lib/wsdl4j-1.6.2.jar
workspace/bfitzpat/org.jboss.tools.uddi.core/plugin.xml
workspace/bfitzpat/org.jboss.tools.uddi.core/src/
workspace/bfitzpat/org.jboss.tools.uddi.core/src/org/
workspace/bfitzpat/org.jboss.tools.uddi.core/src/org/jboss/
workspace/bfitzpat/org.jboss.tools.uddi.core/src/org/jboss/tools/
workspace/bfitzpat/org.jboss.tools.uddi.core/src/org/jboss/tools/uddi/
workspace/bfitzpat/org.jboss.tools.uddi.core/src/org/jboss/tools/uddi/core/
workspace/bfitzpat/org.jboss.tools.uddi.core/src/org/jboss/tools/uddi/core/Activator.java
workspace/bfitzpat/org.jboss.tools.uddi.core/src/org/jboss/tools/uddi/core/UDDIPreferenceInitializer.java
workspace/bfitzpat/org.jboss.tools.uddi.ui/
workspace/bfitzpat/org.jboss.tools.uddi.ui/.classpath
workspace/bfitzpat/org.jboss.tools.uddi.ui/.project
workspace/bfitzpat/org.jboss.tools.uddi.ui/.settings/
workspace/bfitzpat/org.jboss.tools.uddi.ui/.settings/org.eclipse.jdt.core.prefs
workspace/bfitzpat/org.jboss.tools.uddi.ui/META-INF/
workspace/bfitzpat/org.jboss.tools.uddi.ui/META-INF/MANIFEST.MF
workspace/bfitzpat/org.jboss.tools.uddi.ui/build.properties
workspace/bfitzpat/org.jboss.tools.uddi.ui/icons/
workspace/bfitzpat/org.jboss.tools.uddi.ui/icons/business.gif
workspace/bfitzpat/org.jboss.tools.uddi.ui/icons/sample.gif
workspace/bfitzpat/org.jboss.tools.uddi.ui/icons/service.gif
workspace/bfitzpat/org.jboss.tools.uddi.ui/icons/tmodel.gif
workspace/bfitzpat/org.jboss.tools.uddi.ui/plugin.xml
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/Activator.java
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/connection/
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/connection/JUDDIConnection.java
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/connection/JUDDIConnectionFactory.java
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/NameSorter.java
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/RegistryView.java
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/TreeObject.java
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/TreeParent.java
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/ViewContentProvider.java
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/ViewLabelProvider.java
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/wizard/
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/wizard/NewJUDDIConnectionWizard.java
workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/wizard/NewJUDDIConnectionWizardPage.java
Log:
JBIDE-6411 - Working on some UDDI/SAP SR support and stashing in workspace for now
Added: workspace/bfitzpat/.project
===================================================================
--- workspace/bfitzpat/.project (rev 0)
+++ workspace/bfitzpat/.project 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>bfitzpat</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Property changes on: workspace/bfitzpat/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/.classpath
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.core/.classpath (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.core/.classpath 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-configuration-1.5.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cxf-api-2.3.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cxf-common-utilities-2.3.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cxf-rt-bindings-soap-2.3.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cxf-rt-core-2.3.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cxf-rt-databinding-jaxb-2.3.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-jaxws-2.3.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-simple-2.3.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cxf-rt-transports-http-2.3.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-addr-2.3.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cxf-tools-common-2.3.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jaxr-api-1.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/juddi-client-3.1.3-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/juddi-client-extras-3.1.3-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/juddi-core-3.1.3-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.12.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/neethi-2.0.4.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/uddi-ws-3.1.3-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.2.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/XmlSchema-1.4.7.jar"/>
+ <classpathentry exported="true" kind="lib" path="META-INF/"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/.project
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.core/.project (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.core/.project 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.uddi.core</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.core/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.core/.settings/org.eclipse.jdt.core.prefs 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,8 @@
+#Mon Oct 24 09:45:14 MDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/build.properties
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.core/build.properties (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.core/build.properties 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,34 @@
+source.. = src/
+output.. = bin/
+bin.includes = .,\
+ META-INF/,\
+ lib/commons-collections-3.2.1.jar,\
+ lib/commons-configuration-1.5.jar,\
+ lib/commons-lang-2.3.jar,\
+ lib/commons-logging-1.1.jar,\
+ lib/cxf-api-2.3.1.jar,\
+ lib/cxf-common-utilities-2.3.1.jar,\
+ lib/cxf-rt-bindings-soap-2.3.1.jar,\
+ lib/cxf-rt-core-2.3.1.jar,\
+ lib/cxf-rt-databinding-jaxb-2.3.1.jar,\
+ lib/cxf-rt-frontend-jaxws-2.3.1.jar,\
+ lib/cxf-rt-frontend-simple-2.3.1.jar,\
+ lib/cxf-rt-transports-http-2.3.1.jar,\
+ lib/cxf-rt-ws-addr-2.3.1.jar,\
+ lib/cxf-tools-common-2.3.1.jar,\
+ lib/jaxr-api-1.0.jar,\
+ lib/juddi-client-3.1.3-SNAPSHOT.jar,\
+ lib/juddi-client-extras-3.1.3-SNAPSHOT.jar,\
+ lib/juddi-core-3.1.3-SNAPSHOT.jar,\
+ lib/log4j-1.2.12.jar,\
+ lib/neethi-2.0.4.jar,\
+ lib/uddi-ws-3.1.3-SNAPSHOT.jar,\
+ lib/wsdl4j-1.6.2.jar,\
+ lib/XmlSchema-1.4.7.jar,\
+ plugin.xml
+src.includes = src/,\
+ build.properties,\
+ META-INF/,\
+ .settings/,\
+ .project,\
+ .classpath
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/build.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/XmlSchema-1.4.7.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/XmlSchema-1.4.7.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/commons-collections-3.2.1.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/commons-collections-3.2.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/commons-configuration-1.5.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/commons-configuration-1.5.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/commons-lang-2.3.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/commons-lang-2.3.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/commons-logging-1.1.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/commons-logging-1.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-api-2.3.1.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-api-2.3.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-common-utilities-2.3.1.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-common-utilities-2.3.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-bindings-soap-2.3.1.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-bindings-soap-2.3.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-core-2.3.1.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-core-2.3.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-databinding-jaxb-2.3.1.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-databinding-jaxb-2.3.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-frontend-jaxws-2.3.1.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-frontend-jaxws-2.3.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-frontend-simple-2.3.1.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-frontend-simple-2.3.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-transports-http-2.3.1.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-transports-http-2.3.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-ws-addr-2.3.1.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-rt-ws-addr-2.3.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-tools-common-2.3.1.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/cxf-tools-common-2.3.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/jaxr-api-1.0.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/jaxr-api-1.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/juddi-client-3.1.3-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/juddi-client-3.1.3-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/juddi-client-extras-3.1.3-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/juddi-client-extras-3.1.3-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/juddi-core-3.1.3-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/juddi-core-3.1.3-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/log4j-1.2.12.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/log4j-1.2.12.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/neethi-2.0.4.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/neethi-2.0.4.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/uddi-ws-3.1.3-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/uddi-ws-3.1.3-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/wsdl4j-1.6.2.jar
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/lib/wsdl4j-1.6.2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/plugin.xml
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.core/plugin.xml (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.core/plugin.xml 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.core.runtime.preferences">
+ <initializer
+ class="org.jboss.tools.uddi.core.UDDIPreferenceInitializer">
+ </initializer>
+ </extension>
+
+</plugin>
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/plugin.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/src/org/jboss/tools/uddi/core/Activator.java
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.core/src/org/jboss/tools/uddi/core/Activator.java (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.core/src/org/jboss/tools/uddi/core/Activator.java 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,329 @@
+package org.jboss.tools.uddi.core;
+
+import java.util.ArrayList;
+
+import org.apache.cxf.common.WSDLConstants;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.juddi.v3.client.ClassUtil;
+import org.apache.juddi.v3.client.config.ClientConfig;
+import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClientContainer;
+import org.apache.juddi.v3.client.transport.Transport;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.uddi.api_v3.AuthToken;
+import org.uddi.api_v3.BusinessInfo;
+import org.uddi.api_v3.BusinessList;
+import org.uddi.api_v3.FindBusiness;
+import org.uddi.api_v3.FindQualifiers;
+import org.uddi.api_v3.FindService;
+import org.uddi.api_v3.FindTModel;
+import org.uddi.api_v3.GetAuthToken;
+import org.uddi.api_v3.Name;
+import org.uddi.api_v3.ServiceInfo;
+import org.uddi.api_v3.ServiceList;
+import org.uddi.api_v3.TModelInfo;
+import org.uddi.api_v3.TModelList;
+import org.uddi.v3_service.UDDIInquiryPortType;
+import org.uddi.v3_service.UDDISecurityPortType;
+
+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;
+ }
+
+ public static void getAuthToken( String uddiNode) {
+ UDDISecurityPortType security = getSecurityPort(uddiNode);
+ GetAuthToken getAuthToken = new GetAuthToken();
+ getAuthToken.setUserID("sruser");
+ getAuthToken.setCred("eswork123");
+ try {
+ AuthToken authToken = security.getAuthToken(getAuthToken);
+ System.out.println ("AUTHTOKEN = "
+ + authToken.getAuthInfo());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public static AuthToken getAuthToken( UDDISecurityPortType security ) {
+ GetAuthToken getAuthToken = new GetAuthToken();
+ getAuthToken.setUserID("sruser");
+ getAuthToken.setCred("eswork123");
+ try {
+ AuthToken authToken = security.getAuthToken(getAuthToken);
+ System.out.println ("AUTHTOKEN = "
+ + authToken.getAuthInfo());
+ return authToken;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public static UDDISecurityPortType getSecurityPort ( String uddiNode ) {
+ try {
+ ClientConfig config = UDDIClientContainer.getUDDIClerkManager(null).
+ getClientConfig();
+ String clazz = config.getUDDINode(uddiNode).getProxyTransport();
+ Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
+ if (transportClass!=null) {
+ Transport transport = (Transport) transportClass.
+ getConstructor(String.class).newInstance(uddiNode);
+ UDDISecurityPortType security = transport.getUDDISecurityService();
+ return security;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public static UDDIInquiryPortType getInquiryPort ( String uddiNode ) {
+ try {
+ ClientConfig config = UDDIClientContainer.getUDDIClerkManager(null).
+ getClientConfig();
+ String clazz = config.getUDDINode(uddiNode).getProxyTransport();
+ Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
+ if (transportClass!=null) {
+ Transport transport = (Transport) transportClass.
+ getConstructor(String.class).newInstance(uddiNode);
+ UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+ return inquiry;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public static String[] getBusinesses2(String uddiNode) throws Exception {
+
+ ArrayList<String> stringList = new ArrayList<String>();
+ UDDIInquiryPortType inquiry = null;
+ UDDISecurityPortType security = null;
+ AuthToken token = null;
+ try {
+ ClientConfig config = UDDIClientContainer.getUDDIClerkManager(null).
+ getClientConfig();
+ String clazz = config.getUDDINode(uddiNode).getProxyTransport();
+ Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
+ if (transportClass!=null) {
+ Transport transport = (Transport) transportClass.
+ getConstructor(String.class).newInstance(uddiNode);
+ inquiry = transport.getUDDIInquiryService();
+ security = transport.getUDDISecurityService();
+
+ Client client = ClientProxy.getClient(security);
+ client.getOutInterceptors().add(new LoggingOutInterceptor());
+ client.getInInterceptors().add(new LoggingInInterceptor());
+
+ GetAuthToken getAuthToken = new GetAuthToken();
+ getAuthToken.setUserID("sruser");
+ getAuthToken.setCred("eswork123");
+ try {
+ token = security.getAuthToken(getAuthToken);
+ System.out.println ("AUTHTOKEN = "
+ + token.getAuthInfo());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ FindBusiness fb = new FindBusiness();
+ fb.setAuthInfo(token.getAuthInfo());
+ fb.setMaxRows(10);
+ Name name = new Name();
+ name.setValue("%");
+ FindQualifiers fq = new FindQualifiers();
+ fq.getFindQualifier().add("orLikeKeys");
+ fq.getFindQualifier().add("caseInsensitiveMatch");
+ fq.getFindQualifier().add("approximateMatch");
+ fb.setFindQualifiers(fq);
+ fb.getName().add(name);
+ BusinessList bl = inquiry.findBusiness(fb);
+ for (BusinessInfo bi : bl.getBusinessInfos().getBusinessInfo()) {
+ if (!bi.getName().isEmpty()) {
+ stringList.add(bi.getName().get(0).getValue());
+// for (int i = 0; i < bi.getName().size(); i++)
+// System.out.println("Business Name: " + bi.getName().get(i).getValue());
+ }
+ }
+ return (String[]) stringList.toArray(new String[stringList.size()]);
+ }
+
+ public static String[] getServices2(String uddiNode) throws Exception {
+
+ ArrayList<String> stringList = new ArrayList<String>();
+ UDDIInquiryPortType inquiry = null;
+ UDDISecurityPortType security = null;
+ AuthToken token = null;
+ try {
+// UDDIClerkManager mgr = new UDDIClerkManager()
+ ClientConfig config = UDDIClientContainer.getUDDIClerkManager(null).
+ getClientConfig();
+ String clazz = config.getUDDINode(uddiNode).getProxyTransport();
+ Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
+ if (transportClass!=null) {
+ Transport transport = (Transport) transportClass.
+ getConstructor(String.class).newInstance(uddiNode);
+ inquiry = transport.getUDDIInquiryService();
+ security = transport.getUDDISecurityService();
+
+ Client client = ClientProxy.getClient(security);
+ client.getOutInterceptors().add(new LoggingOutInterceptor());
+ client.getInInterceptors().add(new LoggingInInterceptor());
+
+ GetAuthToken getAuthToken = new GetAuthToken();
+ getAuthToken.setUserID("sruser");
+ getAuthToken.setCred("eswork123");
+ try {
+ token = security.getAuthToken(getAuthToken);
+ System.out.println ("AUTHTOKEN = "
+ + token.getAuthInfo());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ FindService fs = new FindService();
+ fs.setMaxRows(10);
+ Name name = new Name();
+ name.setValue("%");
+ FindQualifiers fq = new FindQualifiers();
+ fq.getFindQualifier().add("orLikeKeys");
+ fq.getFindQualifier().add("caseInsensitiveMatch");
+ fq.getFindQualifier().add("approximateMatch");
+ fs.setFindQualifiers(fq);
+ fs.getName().add(name);
+ ServiceList bl = inquiry.findService(fs);
+ for (ServiceInfo si : bl.getServiceInfos().getServiceInfo()) {
+ if (!si.getName().isEmpty()) {
+ stringList.add(si.getName().get(0).getValue());
+ for (int i = 0; i < si.getName().size(); i++)
+ System.out.println("Service Name: " + si.getName().get(i).getValue());
+ }
+ }
+ return (String[]) stringList.toArray(new String[stringList.size()]);
+ }
+
+ public static String[] getBusinesses(String uddiNode) throws Exception {
+ UDDIInquiryPortType inquiry = getInquiryPort(uddiNode);
+ UDDISecurityPortType security = getSecurityPort(uddiNode);
+ getAuthToken(security);
+
+ FindBusiness fb = new FindBusiness();
+ fb.setMaxRows(10);
+ Name name = new Name();
+ name.setValue("%");
+ FindQualifiers fq = new FindQualifiers();
+ fq.getFindQualifier().add("orLikeKeys");
+ fq.getFindQualifier().add("caseInsensitiveMatch");
+ fq.getFindQualifier().add("approximateMatch");
+ fb.setFindQualifiers(fq);
+ fb.getName().add(name);
+ BusinessList bl = inquiry.findBusiness(fb);
+ ArrayList<String> stringList = new ArrayList<String>();
+ for (BusinessInfo bi : bl.getBusinessInfos().getBusinessInfo()) {
+ if (!bi.getName().isEmpty()) {
+ stringList.add(bi.getName().get(0).getValue());
+ for (int i = 0; i < bi.getName().size(); i++)
+ System.out.println("Business Name: " + bi.getName().get(i).getValue());
+ }
+ }
+ return (String[]) stringList.toArray(new String[stringList.size()]);
+ }
+
+ public static String[] getBusinesses(UDDIInquiryPortType inquiry) throws Exception {
+ FindBusiness fb = new FindBusiness();
+ fb.setMaxRows(10);
+ Name name = new Name();
+ name.setValue("%");
+ FindQualifiers fq = new FindQualifiers();
+ fq.getFindQualifier().add("orLikeKeys");
+ fq.getFindQualifier().add("caseInsensitiveMatch");
+ fq.getFindQualifier().add("approximateMatch");
+ fb.setFindQualifiers(fq);
+ fb.getName().add(name);
+ BusinessList bl = inquiry.findBusiness(fb);
+ ArrayList<String> stringList = new ArrayList<String>();
+ for (BusinessInfo bi : bl.getBusinessInfos().getBusinessInfo()) {
+ if (!bi.getName().isEmpty()) {
+ stringList.add(bi.getName().get(0).getValue());
+ for (int i = 0; i < bi.getName().size(); i++)
+ System.out.println("Business Name: " + bi.getName().get(i).getValue());
+ }
+ }
+ return (String[]) stringList.toArray(new String[stringList.size()]);
+ }
+
+ public static String[] getServices(UDDIInquiryPortType inquiry) throws Exception {
+ FindService fs = new FindService();
+ fs.setMaxRows(10);
+ Name name = new Name();
+ name.setValue("%");
+ FindQualifiers fq = new FindQualifiers();
+ fq.getFindQualifier().add("orLikeKeys");
+ fq.getFindQualifier().add("caseInsensitiveMatch");
+ fq.getFindQualifier().add("approximateMatch");
+ fs.setFindQualifiers(fq);
+ fs.getName().add(name);
+ ServiceList bl = inquiry.findService(fs);
+ ArrayList<String> stringList = new ArrayList<String>();
+ for (ServiceInfo si : bl.getServiceInfos().getServiceInfo()) {
+ if (!si.getName().isEmpty()) {
+ stringList.add(si.getName().get(0).getValue());
+ for (int i = 0; i < si.getName().size(); i++)
+ System.out.println("Service Name: " + si.getName().get(i).getValue());
+ }
+ }
+ return (String[]) stringList.toArray(new String[stringList.size()]);
+ }
+
+ public static String[] getTModels(UDDIInquiryPortType inquiry) throws Exception {
+ FindTModel fs = new FindTModel();
+ Name name = new Name();
+ name.setValue("%");
+ fs.setName(name);
+ TModelList bl = inquiry.findTModel(fs);
+ ArrayList<String> stringList = new ArrayList<String>();
+ if (bl.getTModelInfos() != null && bl.getTModelInfos().getTModelInfo().size() > 0) {
+ for (TModelInfo si : bl.getTModelInfos().getTModelInfo()) {
+ if (si.getName().getValue().length() > 0) {
+ stringList.add(si.getName().getValue());
+ System.out.println("TModelInfo Name: " + si.getName().getValue());
+ }
+ }
+ }
+ return (String[]) stringList.toArray(new String[stringList.size()]);
+ }
+
+}
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/src/org/jboss/tools/uddi/core/Activator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.core/src/org/jboss/tools/uddi/core/UDDIPreferenceInitializer.java
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.core/src/org/jboss/tools/uddi/core/UDDIPreferenceInitializer.java (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.core/src/org/jboss/tools/uddi/core/UDDIPreferenceInitializer.java 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,14 @@
+package org.jboss.tools.uddi.core;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+
+public class UDDIPreferenceInitializer extends AbstractPreferenceInitializer {
+
+ public UDDIPreferenceInitializer() {
+ }
+
+ @Override
+ public void initializeDefaultPreferences() {
+ }
+
+}
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.core/src/org/jboss/tools/uddi/core/UDDIPreferenceInitializer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/.classpath
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.ui/.classpath (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.ui/.classpath 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/.project
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.ui/.project (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.ui/.project 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.uddi.ui</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.ui/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.ui/.settings/org.eclipse.jdt.core.prefs 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,8 @@
+#Mon Oct 24 09:48:54 MDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/META-INF/MANIFEST.MF
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.ui/META-INF/MANIFEST.MF (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.ui/META-INF/MANIFEST.MF 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Ui
+Bundle-SymbolicName: org.jboss.tools.uddi.ui; singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.jboss.tools.uddi.ui.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.jboss.tools.uddi.core;bundle-version="1.0.0",
+ org.eclipse.datatools.connectivity;bundle-version="1.2.3",
+ org.eclipse.datatools.connectivity.ui;bundle-version="1.2.1",
+ org.eclipse.datatools.connectivity.ui.dse;bundle-version="1.1.4"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/build.properties
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.ui/build.properties (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.ui/build.properties 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,16 @@
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+ META-INF/,\
+ .,\
+ icons/,\
+ resources/
+src.includes = resources/,\
+ plugin.xml,\
+ icons/,\
+ build.properties,\
+ META-INF/,\
+ .settings/,\
+ .project,\
+ .classpath,\
+ src/
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/build.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/icons/business.gif
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/icons/business.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/icons/sample.gif
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/icons/sample.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/icons/service.gif
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/icons/service.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/icons/tmodel.gif
===================================================================
(Binary files differ)
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/icons/tmodel.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/plugin.xml
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.ui/plugin.xml (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.ui/plugin.xml 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+ <extension
+ point="org.eclipse.ui.views">
+ <category
+ name="JBoss UDDI"
+ id="org.jboss.tools.uddi.ui">
+ </category>
+ <view
+ name="UDDI Registries"
+ icon="icons/sample.gif"
+ category="org.jboss.tools.uddi.ui"
+ class="org.jboss.tools.uddi.ui.view.RegistryView"
+ id="org.jboss.tools.uddi.ui.view.RegistryView">
+ </view>
+ </extension>
+ <extension
+ point="org.eclipse.datatools.connectivity.connectionProfile">
+ <connectionFactory
+ class="org.jboss.tools.uddi.ui.connection.JUDDIConnectionFactory"
+ id="org.apache.juddi.v3.client.transport.Transport"
+ name="JUDDI Connection Factory"
+ profile="org.jboss.tools.uddi.ui.juddi">
+ </connectionFactory>
+ <connectionProfile
+ category="org.jboss.tools.uddi.ui.juddi.category"
+ icon="icons/service.gif"
+ id="org.jboss.tools.uddi.ui.juddi"
+ name="JUDDI Connection Profile"
+ pingFactory="org.jboss.tools.uddi.ui.connection.JUDDIConnectionFactory">
+ </connectionProfile>
+ <category
+ id="org.jboss.tools.uddi.ui.juddi.category"
+ name="UDDI">
+ </category>
+ <newWizard
+ class="org.jboss.tools.uddi.ui.wizard.NewJUDDIConnectionWizard"
+ description="Creates a new JUDDI Connection Profile"
+ icon="icons/service.gif"
+ id="org.jboss.tools.uddi.ui.juddi.newwizard"
+ name="JUDDI Connection Profile"
+ profile="org.jboss.tools.uddi.ui.juddi">
+ </newWizard>
+ </extension>
+
+</plugin>
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/plugin.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/Activator.java
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/Activator.java (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/Activator.java 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,61 @@
+package org.jboss.tools.uddi.ui;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+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.tools.uddi.ui"; //$NON-NLS-1$
+
+ // 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;
+ }
+
+ /**
+ * Returns an image descriptor for the image file at the given
+ * plug-in relative path
+ *
+ * @param path the path
+ * @return the image descriptor
+ */
+ public static ImageDescriptor getImageDescriptor(String path) {
+ return imageDescriptorFromPlugin(PLUGIN_ID, path);
+ }
+}
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/Activator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/connection/JUDDIConnection.java
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/connection/JUDDIConnection.java (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/connection/JUDDIConnection.java 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,174 @@
+package org.jboss.tools.uddi.ui.connection;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Properties;
+
+import org.eclipse.datatools.connectivity.IConnectionProfile;
+import org.eclipse.datatools.connectivity.Version;
+import org.eclipse.datatools.connectivity.VersionProviderConnection;
+import org.uddi.api_v3.AuthToken;
+import org.uddi.api_v3.GetAuthToken;
+import org.uddi.v3_service.UDDIInquiryPortType;
+import org.uddi.v3_service.UDDISecurityPortType;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.juddi.v3.client.ClassUtil;
+import org.apache.juddi.v3.client.config.ClientConfig;
+import org.apache.juddi.v3.client.config.UDDIClientContainer;
+import org.apache.juddi.v3.client.config.UDDINode;
+import org.apache.juddi.v3.client.transport.SAPRegistryJAXWSTransport;
+import org.apache.juddi.v3.client.transport.Transport;
+
+public class JUDDIConnection extends VersionProviderConnection {
+
+ private Transport rawTransport = null;
+ private String inquiryURL;
+ private String securityURL;
+ private boolean needsAuthentication;
+
+ public JUDDIConnection(IConnectionProfile profile, Class<?> factoryClass) {
+ super(profile, factoryClass);
+ }
+
+ public void connect() {
+ Properties props =
+ getConnectionProfile().getBaseProperties();
+ inquiryURL = (String) props.get("inquiry");
+ securityURL = (String) props.get("security");
+ Boolean convert = (Boolean) props.get("needsAuthentication");
+ needsAuthentication = convert.booleanValue();
+
+ String filepath = createTemporaryUDDIXMLFile();
+ System.out.println(filepath);
+
+ try {
+// ClientConfig config = UDDIClientContainer.getUDDIClerkManager(null).
+// getClientConfig();
+ ClientConfig config = new ClientConfig(filepath);
+ String clazz = config.getUDDINode(getConnectionProfile().getName()).getProxyTransport();
+ String managerName = config.getManagerName();
+ Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
+ if (transportClass!=null) {
+ UDDINode node = config.getUDDINode(getConnectionProfile().getName());
+ SAPRegistryJAXWSTransport transport = new SAPRegistryJAXWSTransport(managerName, getConnectionProfile().getName());
+
+// Transport transport = (Transport) transportClass.
+// getConstructor(String.class, String.class).newInstance("temp-uddi", getConnectionProfile().getName());
+ UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+ UDDISecurityPortType security = transport.getUDDISecurityService();
+
+ Client client = ClientProxy.getClient(security);
+ client.getOutInterceptors().add(new LoggingOutInterceptor());
+ client.getInInterceptors().add(new LoggingInInterceptor());
+
+ GetAuthToken getAuthToken = new GetAuthToken();
+ getAuthToken.setUserID("sruser");
+ getAuthToken.setCred("eswork123");
+ try {
+ AuthToken token = security.getAuthToken(getAuthToken);
+ System.out.println ("AUTHTOKEN = "
+ + token.getAuthInfo());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ System.out.println(props.toString());
+ }
+
+ private String createTemporaryUDDIXMLFile() {
+ try {
+ // Create temp file.
+ File temp = File.createTempFile("udditemp", ".xml");
+
+ // Delete temp file when program exits.
+ temp.deleteOnExit();
+
+ // Write to temp file
+ BufferedWriter out = new BufferedWriter(new FileWriter(temp));
+ String xml = getUDDIXML();
+ out.write(xml);
+ out.close();
+
+ return temp.getAbsolutePath();
+ } catch (IOException e) {
+ }
+ return null;
+ }
+
+ private String getUDDIXML() {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>");
+ buffer.append("<uddi>");
+ buffer.append("<reloadDelay>5000</reloadDelay>");
+ buffer.append("<manager name=\"temp-uddi\">");
+ buffer.append("<nodes>");
+ buffer.append("<node>");
+ buffer.append("<name>" + getConnectionProfile().getName() + "</name>");
+ buffer.append("<description>" + getConnectionProfile().getDescription() + "</description>");
+ buffer.append("<proxyTransport>org.apache.juddi.v3.client.transport.SAPRegistryJAXWSTransport</proxyTransport>");
+ buffer.append("<inquiryUrl>" + inquiryURL + "</inquiryUrl>");
+ buffer.append("<securityUrl>" + securityURL + "</securityUrl>");
+ buffer.append("</node>");
+ buffer.append("</nodes>");
+ buffer.append("<clerks registerOnStartup=\"false\">");
+ buffer.append("<xregister></xregister>");
+ buffer.append("</clerks>");
+ buffer.append("</manager>");
+ buffer.append("</uddi>");
+ System.out.println(buffer.toString());
+ return buffer.toString();
+ }
+
+ @Override
+ public Object getRawConnection() {
+ return rawTransport;
+ }
+
+ @Override
+ public void close() {
+ if (rawTransport != null) {
+ rawTransport = null;
+ }
+ }
+
+ @Override
+ public Throwable getConnectException() {
+ return null;
+ }
+
+ @Override
+ public Version getProviderVersion() {
+ return null;
+ }
+
+ @Override
+ public String getProviderName() {
+ return null;
+ }
+
+ @Override
+ public Version getTechnologyVersion() {
+ return null;
+ }
+
+ @Override
+ public String getTechnologyName() {
+ return null;
+ }
+
+ @Override
+ protected String getTechnologyRootKey() {
+ return null;
+ }
+
+
+}
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/connection/JUDDIConnection.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/connection/JUDDIConnectionFactory.java
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/connection/JUDDIConnectionFactory.java (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/connection/JUDDIConnectionFactory.java 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,16 @@
+package org.jboss.tools.uddi.ui.connection;
+
+import org.eclipse.datatools.connectivity.IConnection;
+import org.eclipse.datatools.connectivity.IConnectionProfile;
+import org.eclipse.datatools.connectivity.drivers.jdbc.JDBCConnectionFactory;
+
+public class JUDDIConnectionFactory extends JDBCConnectionFactory {
+
+ @Override
+ public IConnection createConnection(IConnectionProfile profile) {
+ JUDDIConnection connection = new JUDDIConnection(profile, getClass());
+ connection.connect();
+ return connection;
+ }
+
+}
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/connection/JUDDIConnectionFactory.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/NameSorter.java
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/NameSorter.java (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/NameSorter.java 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,6 @@
+package org.jboss.tools.uddi.ui.view;
+
+import org.eclipse.jface.viewers.ViewerSorter;
+
+class NameSorter extends ViewerSorter {
+}
\ No newline at end of file
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/NameSorter.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/RegistryView.java
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/RegistryView.java (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/RegistryView.java 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,168 @@
+package org.jboss.tools.uddi.ui.view;
+
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.part.*;
+import org.eclipse.jface.viewers.*;
+import org.eclipse.jface.action.*;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.ui.*;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.SWT;
+
+
+/**
+ * This sample class demonstrates how to plug-in a new
+ * workbench view. The view shows data obtained from the
+ * model. The sample creates a dummy model on the fly,
+ * but a real implementation would connect to the model
+ * available either in this or another plug-in (e.g. the workspace).
+ * The view is connected to the model using a content provider.
+ * <p>
+ * The view uses a label provider to define how model
+ * objects should be presented in the view. Each
+ * view can present the same model objects using
+ * different labels and icons, if needed. Alternatively,
+ * a single label provider can be shared between views
+ * in order to ensure that objects of the same type are
+ * presented in the same way everywhere.
+ * <p>
+ */
+
+public class RegistryView extends ViewPart {
+
+ /**
+ * The ID of the view as specified by the extension.
+ */
+ public static final String ID = "org.jboss.tools.uddi.ui.view.RegistryView";
+
+ private TreeViewer viewer;
+ private DrillDownAdapter drillDownAdapter;
+ private Action action1;
+ private Action action2;
+ private Action doubleClickAction;
+
+ /*
+ * The content provider class is responsible for
+ * providing objects to the view. It can wrap
+ * existing objects in adapters or simply return
+ * objects as-is. These objects may be sensitive
+ * to the current input of the view, or ignore
+ * it and always show the same content
+ * (like Task List, for example).
+ */
+
+ /**
+ * The constructor.
+ */
+ public RegistryView() {
+ }
+
+ /**
+ * This is a callback that will allow us
+ * to create the viewer and initialize it.
+ */
+ public void createPartControl(Composite parent) {
+ viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
+ drillDownAdapter = new DrillDownAdapter(viewer);
+ viewer.setContentProvider(new ViewContentProvider(this));
+ viewer.setLabelProvider(new ViewLabelProvider());
+ viewer.setSorter(new NameSorter());
+ viewer.setInput(getViewSite());
+ makeActions();
+ hookContextMenu();
+ hookDoubleClickAction();
+ contributeToActionBars();
+ }
+
+ private void hookContextMenu() {
+ MenuManager menuMgr = new MenuManager("#PopupMenu");
+ menuMgr.setRemoveAllWhenShown(true);
+ menuMgr.addMenuListener(new IMenuListener() {
+ public void menuAboutToShow(IMenuManager manager) {
+ RegistryView.this.fillContextMenu(manager);
+ }
+ });
+ Menu menu = menuMgr.createContextMenu(viewer.getControl());
+ viewer.getControl().setMenu(menu);
+ getSite().registerContextMenu(menuMgr, viewer);
+ }
+
+ private void contributeToActionBars() {
+ IActionBars bars = getViewSite().getActionBars();
+ fillLocalPullDown(bars.getMenuManager());
+ fillLocalToolBar(bars.getToolBarManager());
+ }
+
+ private void fillLocalPullDown(IMenuManager manager) {
+ manager.add(action1);
+ manager.add(new Separator());
+ manager.add(action2);
+ }
+
+ private void fillContextMenu(IMenuManager manager) {
+ manager.add(action1);
+ manager.add(action2);
+ manager.add(new Separator());
+ drillDownAdapter.addNavigationActions(manager);
+ // Other plug-ins can contribute there actions here
+ manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+ }
+
+ private void fillLocalToolBar(IToolBarManager manager) {
+ manager.add(action1);
+ manager.add(action2);
+ manager.add(new Separator());
+ drillDownAdapter.addNavigationActions(manager);
+ }
+
+ private void makeActions() {
+ action1 = new Action() {
+ public void run() {
+ showMessage("Action 1 executed");
+ }
+ };
+ action1.setText("Action 1");
+ action1.setToolTipText("Action 1 tooltip");
+ action1.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
+ getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK));
+
+ action2 = new Action() {
+ public void run() {
+ showMessage("Action 2 executed");
+ }
+ };
+ action2.setText("Action 2");
+ action2.setToolTipText("Action 2 tooltip");
+ action2.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
+ getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK));
+ doubleClickAction = new Action() {
+ public void run() {
+ ISelection selection = viewer.getSelection();
+ Object obj = ((IStructuredSelection)selection).getFirstElement();
+ showMessage("Double-click detected on "+obj.toString());
+ }
+ };
+ }
+
+ private void hookDoubleClickAction() {
+ viewer.addDoubleClickListener(new IDoubleClickListener() {
+ public void doubleClick(DoubleClickEvent event) {
+ doubleClickAction.run();
+ }
+ });
+ }
+ private void showMessage(String message) {
+ MessageDialog.openInformation(
+ viewer.getControl().getShell(),
+ "UDDI Registries",
+ message);
+ }
+
+ /**
+ * Passing the focus request to the viewer's control.
+ */
+ public void setFocus() {
+ viewer.getControl().setFocus();
+ }
+}
\ No newline at end of file
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/RegistryView.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/TreeObject.java
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/TreeObject.java (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/TreeObject.java 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,34 @@
+package org.jboss.tools.uddi.ui.view;
+
+import org.eclipse.core.runtime.IAdaptable;
+
+class TreeObject implements IAdaptable {
+ private String name;
+ private TreeParent parent;
+ private Object raw;
+
+ public TreeObject(String name) {
+ this.name = name;
+ }
+ public String getName() {
+ return name;
+ }
+ public void setParent(TreeParent parent) {
+ this.parent = parent;
+ }
+ public TreeParent getParent() {
+ return parent;
+ }
+ public String toString() {
+ return getName();
+ }
+ public Object getAdapter(@SuppressWarnings("rawtypes") Class key) {
+ return null;
+ }
+ public Object getRaw() {
+ return raw;
+ }
+ public void setRaw ( Object raw ) {
+ this.raw = raw;
+ }
+}
\ No newline at end of file
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/TreeObject.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/TreeParent.java
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/TreeParent.java (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/TreeParent.java 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,25 @@
+package org.jboss.tools.uddi.ui.view;
+
+import java.util.ArrayList;
+
+class TreeParent extends TreeObject {
+ private ArrayList<TreeObject> children;
+ public TreeParent(String name) {
+ super(name);
+ children = new ArrayList<TreeObject>();
+ }
+ public void addChild(TreeObject child) {
+ children.add(child);
+ child.setParent(this);
+ }
+ public void removeChild(TreeObject child) {
+ children.remove(child);
+ child.setParent(null);
+ }
+ public TreeObject [] getChildren() {
+ return (TreeObject [])children.toArray(new TreeObject[children.size()]);
+ }
+ public boolean hasChildren() {
+ return children.size()>0;
+ }
+}
\ No newline at end of file
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/TreeParent.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/ViewContentProvider.java
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/ViewContentProvider.java (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/ViewContentProvider.java 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,268 @@
+package org.jboss.tools.uddi.ui.view;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.eclipse.jface.viewers.ILazyTreeContentProvider;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.jboss.tools.uddi.core.Activator;
+
+class ViewContentProvider implements IStructuredContentProvider,
+ ITreeContentProvider {
+
+ /**
+ *
+ */
+ private final RegistryView registryView;
+
+ /**
+ * @param registryView
+ */
+ ViewContentProvider(RegistryView registryView) {
+ this.registryView = registryView;
+ }
+ private TreeParent invisibleRoot;
+
+ public void inputChanged(Viewer v, Object oldInput, Object newInput) {
+ }
+ public void dispose() {
+ }
+ public Object[] getElements(Object parent) {
+ if (parent.equals(this.registryView.getViewSite())) {
+ if (invisibleRoot==null) initialize();
+ return getChildren(invisibleRoot);
+ }
+ return getChildren(parent);
+ }
+ public Object getParent(Object child) {
+ if (child instanceof TreeObject) {
+ return ((TreeObject)child).getParent();
+ }
+ return null;
+ }
+ public Object [] getChildren(Object parent) {
+ if (parent instanceof TreeParent) {
+ TreeParent tp = (TreeParent) parent;
+ if (tp.getParent() != null) {// && tp.getParent().getRaw() instanceof UDDIDetails) {
+// UDDIDetails details = (UDDIDetails) tp.getParent().getRaw();
+ if (tp.getName().equals("Businesses")) {
+ try {
+ String uddiRepo = tp.getParent().getName();
+// UDDIInquiryPortType inquiry = Activator.getInquiryPort(uddiRepo);
+// Activator.getAuthToken(uddiRepo);
+ String[] businessNames = Activator.getBusinesses2(uddiRepo);
+ for (int i = 0; i < businessNames.length; i++) {
+ TreeObject business = new TreeObject(businessNames[i]);
+ tp.addChild(business);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ else if (tp.getName().equals("Services")) {
+ try {
+ String uddiRepo = tp.getParent().getName();
+ String[] serviceNames = Activator.getServices2(uddiRepo);
+ for (int i = 0; i < serviceNames.length; i++) {
+ TreeObject service = new TreeObject(serviceNames[i]);
+ tp.addChild(service);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ else if (tp.getName().equals("tModels")) {
+ try {
+ String uddiRepo = tp.getParent().getName();
+// UDDIInquiryPortType inquiry = Activator.getInquiryPort(uddiRepo);
+// Activator.getAuthToken(uddiRepo);
+// String[] tModelNamesNames = Activator.getTModels(inquiry);
+// for (int i = 0; i < tModelNamesNames.length; i++) {
+// TreeObject tModel = new TreeObject(tModelNamesNames[i]);
+// tp.addChild(tModel);
+// }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return ((TreeParent)parent).getChildren();
+ }
+ return new Object[0];
+ }
+ public boolean hasChildren(Object parent) {
+ if (parent instanceof TreeParent) {
+ TreeParent tp = (TreeParent) parent;
+ if (tp.getName().equals("Businesses")) {
+ return true;
+ }
+ if (tp.getName().equals("Services")) {
+ return true;
+ }
+ if (tp.getName().equals("tModels")) {
+ return true;
+ }
+ return ((TreeParent)parent).hasChildren();
+ }
+ return false;
+ }
+
+// public String[] getBusinesses(UDDIInquiryPortType inquiry) throws Exception {
+// FindBusiness fb = new FindBusiness();
+// fb.setMaxRows(10);
+// Name name = new Name();
+// name.setValue("%");
+// FindQualifiers fq = new FindQualifiers();
+// fq.getFindQualifier().add("orLikeKeys");
+// fq.getFindQualifier().add("caseInsensitiveMatch");
+// fq.getFindQualifier().add("approximateMatch");
+// fb.setFindQualifiers(fq);
+// fb.getName().add(name);
+// BusinessList bl = inquiry.findBusiness(fb);
+// ArrayList<String> stringList = new ArrayList<String>();
+// for (BusinessInfo bi : bl.getBusinessInfos().getBusinessInfo()) {
+// if (!bi.getName().isEmpty()) {
+// stringList.add(bi.getName().get(0).getValue());
+// for (int i = 0; i < bi.getName().size(); i++)
+// System.out.println("Business Name: " + bi.getName().get(i).getValue());
+// }
+// }
+// return (String[]) stringList.toArray(new String[stringList.size()]);
+// }
+//
+// public String[] getServices(UDDIInquiryPortType inquiry) throws Exception {
+// FindService fs = new FindService();
+// fs.setMaxRows(10);
+// Name name = new Name();
+// name.setValue("%");
+// FindQualifiers fq = new FindQualifiers();
+// fq.getFindQualifier().add("orLikeKeys");
+// fq.getFindQualifier().add("caseInsensitiveMatch");
+// fq.getFindQualifier().add("approximateMatch");
+// fs.setFindQualifiers(fq);
+// fs.getName().add(name);
+// ServiceList bl = inquiry.findService(fs);
+// ArrayList<String> stringList = new ArrayList<String>();
+// for (ServiceInfo si : bl.getServiceInfos().getServiceInfo()) {
+// if (!si.getName().isEmpty()) {
+// stringList.add(si.getName().get(0).getValue());
+// for (int i = 0; i < si.getName().size(); i++)
+// System.out.println("Service Name: " + si.getName().get(i).getValue());
+// }
+// }
+// return (String[]) stringList.toArray(new String[stringList.size()]);
+// }
+//
+// public String[] getTModels(UDDIInquiryPortType inquiry) throws Exception {
+// FindTModel fs = new FindTModel();
+// Name name = new Name();
+// name.setValue("%");
+// fs.setName(name);
+// TModelList bl = inquiry.findTModel(fs);
+// ArrayList<String> stringList = new ArrayList<String>();
+// if (bl.getTModelInfos() != null && bl.getTModelInfos().getTModelInfo().size() > 0) {
+// for (TModelInfo si : bl.getTModelInfos().getTModelInfo()) {
+// if (si.getName().getValue().length() > 0) {
+// stringList.add(si.getName().getValue());
+// System.out.println("TModelInfo Name: " + si.getName().getValue());
+// }
+// }
+// }
+// return (String[]) stringList.toArray(new String[stringList.size()]);
+// }
+
+/*
+ * We will set up a dummy model to initialize tree heararchy.
+ * In a real code, you will connect to a real model and
+ * expose its hierarchy.
+ */
+ private void initialize() {
+
+ String[] nodes = new String[] { "default", "esb" };
+ TreeParent root = new TreeParent("Registries");
+ for (int i = 0; i < nodes.length; i++) {
+ TreeParent node = getUDDINode(nodes[i]);
+ if (node != null)
+ root.addChild(node);
+ }
+ invisibleRoot = new TreeParent("");
+ invisibleRoot.addChild(root);
+
+ }
+
+// private UDDIInquiryPortType getInquiryPort ( String uddiNode ) {
+// try {
+// ClientConfig config = UDDIClientContainer.getUDDIClerkManager(null).
+// getClientConfig();
+// String clazz = config.getUDDINode(uddiNode).getProxyTransport();
+// Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
+// if (transportClass!=null) {
+// Transport transport = (Transport) transportClass.
+// getConstructor(String.class).newInstance(uddiNode);
+// UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+// return inquiry;
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// return null;
+// }
+
+ private TreeParent getUDDINode(String uddiNode) {
+// try {
+// ClientConfig config = UDDIClientContainer.getUDDIClerkManager(null).
+// getClientConfig();
+// String clazz = config.getUDDINode(uddiNode).getProxyTransport();
+// Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
+// if (transportClass!=null) {
+// Transport transport = (Transport) transportClass.
+// getConstructor(String.class).newInstance(uddiNode);
+// UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+// UDDISecurityPortType security = transport.getUDDISecurityService();
+// if (uddiRegistries == null)
+// uddiRegistries = new HashMap<String, UDDIInquiryPortType>();
+// uddiRegistries.put(uddiNode, inquiry);
+//// UDDIDetails details = new UDDIDetails();
+//// details.inquiry = inquiry;
+//// details.security = security;
+ TreeParent node = new TreeParent(uddiNode);
+ TreeParent businesses = new TreeParent("Businesses");
+ TreeParent services = new TreeParent("Services");
+ TreeParent tModels = new TreeParent("tModels");
+ node.addChild(businesses);
+ node.addChild(services);
+ node.addChild(tModels);
+// node.setRaw(details);
+ return node;
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// return null;
+ }
+
+ class UDDIDetails {
+// private UDDIInquiryPortType inquiry = null;
+// private UDDISecurityPortType security = null;
+// public UDDIInquiryPortType getInquiry() {
+// return inquiry;
+// }
+// public void setInquiry(UDDIInquiryPortType inquiry) {
+// this.inquiry = inquiry;
+// }
+// public UDDISecurityPortType getSecurity() {
+// return security;
+// }
+// public void setSecurity(UDDISecurityPortType security) {
+// this.security = security;
+// }
+ }
+
+ public void updateElement(Object parent, int index) {
+ }
+
+ public void updateChildCount(Object element, int currentChildCount) {
+ }
+ }
\ No newline at end of file
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/ViewContentProvider.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/ViewLabelProvider.java
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/ViewLabelProvider.java (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/ViewLabelProvider.java 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,67 @@
+package org.jboss.tools.uddi.ui.view;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.uddi.ui.Activator;
+import org.jboss.tools.uddi.ui.view.ViewContentProvider.UDDIDetails;
+
+class ViewLabelProvider extends LabelProvider {
+
+ private ImageDescriptor SERVICE_IMG_DESC = null;
+ private ImageDescriptor BUSINESS_IMG_DESC = null;
+ private ImageDescriptor TMODEL_IMG_DESC = null;
+
+ private Image SERVICE_IMG = null;
+ private Image BUSINESS_IMG = null;
+ private Image TMODEL_IMG = null;
+
+ private void initialize() {
+ this.SERVICE_IMG_DESC = Activator.getImageDescriptor("icons\\service.gif");
+ this.SERVICE_IMG = SERVICE_IMG_DESC.createImage();
+ this.BUSINESS_IMG_DESC = Activator.getImageDescriptor("icons\\business.gif");
+ this.BUSINESS_IMG = BUSINESS_IMG_DESC.createImage();
+ this.TMODEL_IMG_DESC = Activator.getImageDescriptor("icons\\tmodel.gif");
+ this.TMODEL_IMG = TMODEL_IMG_DESC.createImage();
+ }
+
+ public String getText(Object obj) {
+ return obj.toString();
+ }
+
+ public Image getImage(Object obj) {
+ if (this.SERVICE_IMG == null)
+ initialize();
+ String imageKey = ISharedImages.IMG_OBJ_ELEMENT;
+ if (obj instanceof TreeObject) {
+ TreeObject to = (TreeObject) obj;
+ if (to.getParent() != null && to.getParent().getName().contains("Businesses")) {
+ return BUSINESS_IMG;
+ }
+ if (to.getParent() != null && to.getParent().getName().contains("Services")) {
+ return SERVICE_IMG;
+ }
+ if (to.getParent() != null && to.getParent().getName().contains("tModels")) {
+ return TMODEL_IMG;
+ }
+ }
+ if (obj instanceof TreeParent) {
+ if (((TreeParent)obj).getRaw() != null && ((TreeParent)obj).getRaw() instanceof UDDIDetails) {
+ // do nothing, use object key
+ }
+ else
+ imageKey = ISharedImages.IMG_OBJ_FOLDER;
+ }
+ return PlatformUI.getWorkbench().getSharedImages().getImage(imageKey);
+ }
+
+ @Override
+ public void dispose() {
+ this.BUSINESS_IMG.dispose();
+ this.SERVICE_IMG.dispose();
+ this.TMODEL_IMG.dispose();
+ super.dispose();
+ }
+}
\ No newline at end of file
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/view/ViewLabelProvider.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/wizard/NewJUDDIConnectionWizard.java
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/wizard/NewJUDDIConnectionWizard.java (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/wizard/NewJUDDIConnectionWizard.java 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,27 @@
+package org.jboss.tools.uddi.ui.wizard;
+
+import java.util.Properties;
+
+import org.eclipse.datatools.connectivity.ui.wizards.NewConnectionProfileWizard;
+import org.eclipse.jface.wizard.IWizard;
+
+public class NewJUDDIConnectionWizard extends NewConnectionProfileWizard
+ implements IWizard {
+
+ private NewJUDDIConnectionWizardPage page;
+
+ public NewJUDDIConnectionWizard() {
+ }
+
+ @Override
+ public void addCustomPages() {
+ this.page = new NewJUDDIConnectionWizardPage("NewJUDDIConnectionWizard.NewJUDDIConnectionWizardPage");
+ this.addPage(this.page);
+ }
+
+ @Override
+ public Properties getProfileProperties() {
+ return this.page.getPageProperties();
+ }
+
+}
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/wizard/NewJUDDIConnectionWizard.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/wizard/NewJUDDIConnectionWizardPage.java
===================================================================
--- workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/wizard/NewJUDDIConnectionWizardPage.java (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/wizard/NewJUDDIConnectionWizardPage.java 2011-11-29 15:10:53 UTC (rev 36733)
@@ -0,0 +1,102 @@
+package org.jboss.tools.uddi.ui.wizard;
+
+import java.util.Properties;
+
+import org.eclipse.datatools.connectivity.ui.wizards.ConnectionProfileDetailsPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class NewJUDDIConnectionWizardPage extends
+ ConnectionProfileDetailsPage {
+
+ private boolean needsAuthentication = false;
+ private String inquiryURL;
+ private String securityURL;
+ private Label securityURLLabel;
+ private Text securityURLText;
+ private Button needsAuthenticationCheck;
+ private Text inquiryURLText;
+ private Label inquiryURLLabel;
+
+ private String defaultInquiry = "http://sr.esworkplace.sap.com:80/uddi/api/inquiry";
+ private String defaultSecurity = "http://sr.esworkplace.sap.com:80/uddi/api/security";
+
+ public NewJUDDIConnectionWizardPage(String wizardPageName) {
+ super(wizardPageName);
+ this.setTitle("Provide UDDI Details");
+ this.setMessage("Provide the Inquiry URL, specify whether the registry requires authentication, and if so provide a Security URL");
+ }
+
+ @Override
+ public void createCustomControl(Composite parent) {
+ Composite composite = new Composite(parent, SWT.NONE);
+ GridLayout gl = new GridLayout();
+ gl.numColumns = 2;
+ composite.setLayout(gl);
+
+ inquiryURLLabel = new Label(composite, SWT.NONE);
+ inquiryURLLabel.setText("Inquiry URL:");
+
+ inquiryURLText = new Text(composite, SWT.BORDER);
+ GridData inquiryURLGD = new GridData(GridData.FILL_HORIZONTAL);
+ inquiryURLText.setLayoutData(inquiryURLGD);
+ inquiryURLText.addModifyListener(new ModifyListener() {
+ @Override
+ public void modifyText(ModifyEvent e) {
+ NewJUDDIConnectionWizardPage.this.inquiryURL = NewJUDDIConnectionWizardPage.this.inquiryURLText.getText();
+ }
+ });
+ inquiryURLText.setText(defaultInquiry);
+
+ needsAuthenticationCheck = new Button(composite, SWT.CHECK);
+ needsAuthenticationCheck.setLayoutData(new GridData(SWT.LEFT, SWT.None, true, false, 2, 1));
+ needsAuthenticationCheck.setText("Needs Authentication");
+ needsAuthenticationCheck.setSelection(needsAuthentication);
+ needsAuthenticationCheck.addSelectionListener(new SelectionAdapter(){
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ NewJUDDIConnectionWizardPage.this.needsAuthentication = NewJUDDIConnectionWizardPage.this.needsAuthenticationCheck.getSelection();
+ handleUpdateValidationCheckState();
+ }
+ });
+
+ securityURLLabel = new Label(composite, SWT.NONE);
+ securityURLLabel.setLayoutData(new GridData());
+ securityURLLabel.setText("Security URL:");
+
+ securityURLText = new Text(composite, SWT.BORDER);
+ securityURLText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ securityURLText.addModifyListener(new ModifyListener() {
+ @Override
+ public void modifyText(ModifyEvent e) {
+ NewJUDDIConnectionWizardPage.this.securityURL = NewJUDDIConnectionWizardPage.this.securityURLText.getText();
+ }
+ });
+ securityURLText.setText(defaultSecurity);
+
+ handleUpdateValidationCheckState();
+ }
+
+ private void handleUpdateValidationCheckState() {
+ this.securityURLLabel.setEnabled(this.needsAuthentication);
+ this.securityURLText.setEnabled(this.needsAuthentication);
+ }
+
+ public Properties getPageProperties() {
+ Properties pageProps = new Properties();
+ pageProps.put("inquiry", inquiryURL);
+ pageProps.put("security", securityURL);
+ pageProps.put("needsAuthentication", needsAuthentication);
+ return pageProps;
+ }
+
+}
Property changes on: workspace/bfitzpat/org.jboss.tools.uddi.ui/src/org/jboss/tools/uddi/ui/wizard/NewJUDDIConnectionWizardPage.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years
JBoss Tools SVN: r36732 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-11-29 10:01:10 -0500 (Tue, 29 Nov 2011)
New Revision: 36732
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java
Log:
[JBIDE-10061] setting correct file permissions on private key file (600)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2011-11-29 14:56:42 UTC (rev 36731)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2011-11-29 15:01:10 UTC (rev 36732)
@@ -107,10 +107,21 @@
}
File libraPrivateKey = getLibraPrivateKey();
SSHKeyPair keyPair = SSHKeyPair.create(passPhrase, libraPrivateKey.getAbsolutePath(), libraPublicKey.getAbsolutePath());
+ setFilePermissions(libraPrivateKey);
addToPrivateKeysPreferences(keyPair);
setSshKey(keyPair.getPublicKeyPath());
}
+ private void setFilePermissions(File file) {
+ // set f permission to correspond to 'chmod 0600' read/write only for user
+ // First clear all permissions for both user and others
+ file.setReadable(false, false);
+ file.setWritable(false, false);
+ // Enable only readable for user
+ file.setReadable(true, true);
+ file.setWritable(true, true);
+ }
+
private void addToPrivateKeysPreferences(SSHKeyPair keyPair) {
Preferences preferences = JSchCorePlugin.getPlugin().getPluginPreferences();
String privateKeys = preferences.getString(IConstants.KEY_PRIVATEKEY);
14 years
JBoss Tools SVN: r36731 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal: utils and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-11-29 09:56:42 -0500 (Tue, 29 Nov 2011)
New Revision: 36731
Added:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/utils/UrlUtils.java
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java
Log:
[JBIDE-10274] made links in logs clickable
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java 2011-11-29 14:52:09 UTC (rev 36730)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java 2011-11-29 14:56:42 UTC (rev 36731)
@@ -12,6 +12,8 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TitleAreaDialog;
@@ -20,18 +22,26 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
+import org.jboss.tools.common.ui.BrowserUtil;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages;
+import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.common.StringUtils;
+import org.jboss.tools.openshift.express.internal.utils.UrlUtils;
/**
* @author André Dietisheim
*/
public class CreationLogDialog extends TitleAreaDialog {
+ private static final Pattern HTTP_LINK_REGEX = Pattern.compile("http[^ |\n]+");
+
private LogEntry[] logEntries;
public CreationLogDialog(Shell parentShell, LogEntry... logEntries) {
@@ -65,9 +75,39 @@
StyledText logText = new StyledText(container, SWT.BORDER | SWT.V_SCROLL);
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.TOP).grab(true, false).applyTo(logText);
writeLogEntries(logEntries, logText);
+ logText.addListener(SWT.MouseDown, onLinkClicked(logText));
return container;
}
+ private Listener onLinkClicked(final StyledText logText) {
+ return new Listener() {
+ public void handleEvent(Event event) {
+ try {
+ String url = getUrl(logText, event);
+ if (url != null
+ && url.length() > 0) {
+ BrowserUtil.checkedCreateExternalBrowser(
+ url, OpenShiftUIActivator.PLUGIN_ID, OpenShiftUIActivator.getDefault().getLog());
+ }
+ } catch (IllegalArgumentException e) {
+ // no character under event.x, event.y
+ }
+ }
+
+ private String getUrl(StyledText logText, Event event) {
+ int offset = logText.getOffsetAtLocation(new Point(event.x, event.y));
+ StyleRange style = logText.getStyleRangeAtOffset(offset);
+ if (style == null
+ || !style.underline) {
+ return null;
+ }
+ return UrlUtils.getUrl(offset, logText.getText());
+ }
+
+
+ };
+ }
+
@Override
protected void createButtonsForButtonBar(Composite parent) {
createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
@@ -89,16 +129,34 @@
private void writeLogEntry(LogEntry logEntry, StringBuilder builder, List<StyleRange> styles) {
appendTitle(logEntry.getName(), builder, styles);
- builder.append(logEntry.getLog());
+ appendLog(logEntry, builder, styles);
+ }
+
+ private void appendLog(LogEntry logEntry, StringBuilder builder, List<StyleRange> styles) {
+ String log = logEntry.getLog();
+ createLinkStyles(log, builder.length(), styles);
+ builder.append(log);
builder.append(StringUtils.getLineSeparator());
}
- private void setStyleRanges(StyledText logText, List<StyleRange> styles) {
- for (StyleRange style : styles) {
- logText.setStyleRange(style);
+ private void createLinkStyles(String log, int baseIndex, List<StyleRange> styles) {
+ Matcher matcher = HTTP_LINK_REGEX.matcher(log);
+ while (matcher.find()) {
+ StyleRange linkStyle = createLinkStyleRange(matcher.start() + baseIndex, matcher.end() + baseIndex);
+ styles.add(linkStyle);
}
}
+ private StyleRange createLinkStyleRange(int start, int stop) {
+ StyleRange styleRange = new StyleRange();
+ styleRange.start = start;
+ styleRange.length = stop - start;
+ styleRange.fontStyle = SWT.UNDERLINE_LINK;
+ styleRange.underline = true;
+ styleRange.foreground = getShell().getDisplay().getSystemColor(SWT.COLOR_BLUE);
+ return styleRange;
+ }
+
private void appendTitle(String title, StringBuilder builder, List<StyleRange> styles) {
StyleRange styleRange = startBoldStyleRange(builder);
builder.append(title)
@@ -120,7 +178,13 @@
styleRange.length = builder.length() - styleRange.start;
return styleRange;
}
-
+
+ private void setStyleRanges(StyledText logText, List<StyleRange> styles) {
+ for (StyleRange style : styles) {
+ logText.setStyleRange(style);
+ }
+ }
+
public static class LogEntry {
private String name;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java 2011-11-29 14:52:09 UTC (rev 36730)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java 2011-11-29 14:56:42 UTC (rev 36731)
@@ -84,6 +84,7 @@
public ICartridge getSelectedCartridge() {
return selectedCartridge;
}
+
public void setSelectedCartridge(ICartridge cartridge) {
wizardModel.setCartridge(cartridge);
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/utils/UrlUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/utils/UrlUtils.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/utils/UrlUtils.java 2011-11-29 14:56:42 UTC (rev 36731)
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.utils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author André Dietisheim
+ */
+public class UrlUtils {
+
+ private static final int HTTP_SCHEME_MAX_LENGTH = 8;
+ private static final char HTTP_SCHEME_START_CHAR = 'h';
+ private static final Pattern HTTP_SCHEME_REGEX = Pattern.compile("http?://");
+
+ public static String getUrl(int offset, String text) {
+ int start = getUrlStart(offset, text);
+ if (start == -1) {
+ return null;
+ }
+ int stop = getUrlStop(offset, text);
+ if (stop == -1) {
+ return null;
+ }
+ return text.substring(start, stop);
+
+ }
+
+ private static int getUrlStart(int offset, String text) {
+ for (int i = offset; i > 0; --i) {
+ if (text.charAt(i) == HTTP_SCHEME_START_CHAR
+ && (i + HTTP_SCHEME_MAX_LENGTH < text.length())) {
+ Matcher matcher = HTTP_SCHEME_REGEX.matcher(text.substring(i, i + HTTP_SCHEME_MAX_LENGTH));
+ if (matcher.find()) {
+ return i;
+ }
+ }
+ }
+ return -1;
+ }
+
+ private static int getUrlStop(int offset, String text) {
+ for (int i = offset; i < text.length(); ++i) {
+ if (' ' == text.charAt(i)
+ || '\n' == text.charAt(i)) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/utils/UrlUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years
JBoss Tools SVN: r36730 - in trunk/as: plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 8 other directories.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-11-29 09:52:09 -0500 (Tue, 29 Nov 2011)
New Revision: 36730
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7ManagerService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerServiceProxy.java
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/JBoss71ManagerService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java
Log:
JBIDE-10224 - Changing of the management service API to better handle the situation for credential callbacks
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2011-11-29 14:13:23 UTC (rev 36729)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2011-11-29 14:52:09 UTC (rev 36730)
@@ -15,7 +15,6 @@
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
-import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
/**
@@ -55,11 +54,18 @@
/*
* expected to launch own thread
*/
- @Deprecated
- public void beginPolling(IServer server, boolean expectedState, PollThread pt) throws Exception;
public void beginPolling(IServer server, boolean expectedState) throws PollingException;
public IServer getServer();
public boolean isComplete() throws PollingException, RequiresInfoException;
+
+ /**
+ * Called only after poller is "done".
+ * Should return cached final state rather than poll again.
+ *
+ * @return
+ * @throws PollingException
+ * @throws RequiresInfoException
+ */
public boolean getState() throws PollingException, RequiresInfoException;
/*
* clean up any resources / processes. Will ALWAYS be called
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-11-29 14:13:23 UTC (rev 36729)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-11-29 14:52:09 UTC (rev 36730)
@@ -137,13 +137,7 @@
// This way each request for new info is checked only once.
if (!rie.getChecked()) {
rie.setChecked();
- String action = expectedState == IServerStatePoller.SERVER_UP ? SERVER_STARTING
- : SERVER_STOPPING;
- IPollerFailureHandler handler = ExtensionManager
- .getDefault().getFirstPollFailureHandler(poller,
- action, poller.getRequiredProperties());
- handler.handle(poller, action, poller
- .getRequiredProperties());
+ firePollerFailureHandler(expectedState, poller);
}
}
stateStartedOrStopped = checkServerState();
@@ -177,7 +171,6 @@
try {
currentState = poller.getState();
poller.cleanup();
-// alertBehavior(currentState);
alertListener(currentState);
if (finalAlert) {
alertEventLog(currentState);
@@ -187,7 +180,6 @@
poller.cancel(IServerStatePoller.CANCEL);
poller.cleanup();
alertEventLogPollerException(pe);
-// alertBehavior(!expectedState);
alertListener(!expectedState);
return;
} catch (RequiresInfoException rie) {
@@ -234,19 +226,6 @@
alertEventLogSuccess(currentState);
}
}
-
- @Deprecated
- protected void alertBehavior(boolean currentState) {
- if (currentState != expectedState) {
- // it didnt work... cancel all processes! force stop
- behavior.stop(true);
- } else {
- if (currentState == IServerStatePoller.SERVER_UP)
- behavior.setServerStarted();
- else
- behavior.stop(true);
- }
- }
protected void alertListener(boolean currentState) {
if (currentState != expectedState) {
@@ -327,4 +306,13 @@
return STATE_STARTED;
return STATE_STOPPED;
}
+
+ public static void firePollerFailureHandler(boolean expectedState, IServerStatePoller poller) {
+ String action = expectedState == IServerStatePoller.SERVER_UP ? SERVER_STARTING
+ : SERVER_STOPPING;
+ IPollerFailureHandler handler = ExtensionManager
+ .getDefault().getFirstPollFailureHandler(poller,
+ action, poller.getRequiredProperties());
+ handler.handle(poller, action, poller.getRequiredProperties());
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-11-29 14:13:23 UTC (rev 36729)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-11-29 14:52:09 UTC (rev 36730)
@@ -11,7 +11,8 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.v7;
-import java.util.Collections;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Properties;
@@ -24,13 +25,13 @@
import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
-import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
+import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails;
import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService;
import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManagerUtil;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManagerUtil.IServiceAware;
import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerConnectException;
import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ServerState;
-import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManagerUtil.IServiceAware;
import org.osgi.framework.InvalidSyntaxException;
/**
@@ -40,24 +41,58 @@
public static final String POLLER_ID = "org.jboss.ide.eclipse.as.core.server.JBoss7ManagerServicePoller"; //$NON-NLS-1$
private IServer server;
+ private AS7ManagementDetails managementDetails;
private ServerStatePollerType type;
private boolean expectedState;
private IJBoss7ManagerService service;
+ private boolean done = false;
+ private boolean canceled = false;
+ private PollingException pollingException = null;
+ private RequiresInfoException requiresInfoException = null;
+ private List<String> requiredProperties = null;
+ private Properties requiredPropertiesReturned = null;
- @Deprecated
- public void beginPolling(IServer server, boolean expectedState, PollThread pollTread) throws Exception {
- }
-
public void beginPolling(IServer server, boolean expectedState) throws PollingException {
try {
this.service = JBoss7ManagerUtil.getService(server);
+ this.managementDetails = createManagementDetails();
this.server = server;
this.expectedState = expectedState;
+ launchPollingThread();
} catch(InvalidSyntaxException e) {
throw new PollingException(NLS.bind(Messages.CouldNotBeginPolling,server.getName()), e);
}
}
+ private AS7ManagementDetails createManagementDetails() {
+ return new AS7ManagementDetails(server) {
+ public String[] handleCallbacks(String[] prompts) {
+ return handleAsynchCallbacks(prompts);
+ }
+ };
+ }
+
+
+ private String[] handleAsynchCallbacks(String[] prompts) {
+ List<String> tmp = new ArrayList<String>();
+ tmp.addAll(Arrays.asList(prompts));
+ requiredProperties = tmp;
+ requiresInfoException = new RequiresInfoException("Requires proper credentials"); //$NON-NLS-1$
+ while( !done && !canceled && requiredPropertiesReturned == null ) {
+ try {
+ Thread.sleep(500);
+ } catch(InterruptedException ie) {/* Do nothing */}
+ }
+
+ if( done || canceled )
+ return new String[0];
+ String[] retPrompts = new String[prompts.length];
+ for( int i = 0; i < retPrompts.length; i++) {
+ retPrompts[i] = (String)requiredPropertiesReturned.get(prompts[i]);
+ }
+ return retPrompts;
+ }
+
public ServerStatePollerType getPollerType() {
return type;
}
@@ -69,45 +104,63 @@
public IServer getServer() {
return server;
}
+
+ public boolean isComplete() throws PollingException, RequiresInfoException {
+ if (pollingException != null)
+ throw pollingException;
+ if( requiresInfoException != null )
+ throw requiresInfoException;
+ return done;
+ }
- private int getManagementPort(IServer server) {
- if( server != null ) {
- JBoss7Server jbossServer = (JBoss7Server) server.loadAdapter(JBoss7Server.class, new NullProgressMonitor());
- return jbossServer.getManagementPort();
- }
- return IJBoss7ManagerService.MGMT_PORT;
+ public boolean getState() throws PollingException, RequiresInfoException {
+ if( done )
+ return expectedState;
+ return !expectedState;
}
- public boolean isComplete() throws PollingException, RequiresInfoException {
+ public void launchPollingThread() {
+ new Thread() {
+ public void run() {
+ runLoop();
+ }
+ }.start();
+ }
+
+ public void runLoop() {
try {
- if (expectedState == SERVER_DOWN) {
- return awaitShutdown(service);
- } else {
- return awaitRunning(service);
+ while( !done && !canceled ) {
+ if (expectedState == SERVER_DOWN) {
+ done = checkShutdown(service);
+ } else {
+ done = checkRunning(service);
+ }
+ if( !done ) {
+ try {
+ Thread.sleep(300);
+ } catch(InterruptedException ie) {
+ // Ignore
+ }
+ }
}
} catch (Exception e) {
- throw new PollingException(e.getMessage());
+ pollingException = new PollingException(e.getMessage());
}
}
- private Boolean awaitRunning(IJBoss7ManagerService service) {
+ private boolean checkRunning(IJBoss7ManagerService service) {
try {
JBoss7ServerState serverState = null;
- do {
- serverState = service.getServerState(getServer().getHost(), getManagementPort(getServer()));
- } while (serverState == JBoss7ServerState.STARTING);
+ serverState = service.getServerState(managementDetails);
return serverState == JBoss7ServerState.RUNNING;
} catch (Exception e) {
return false;
}
}
- private Boolean awaitShutdown(IJBoss7ManagerService service) {
+ private boolean checkShutdown(IJBoss7ManagerService service) {
try {
- JBoss7ServerState serverState = null;
- do {
- serverState = service.getServerState(getServer().getHost(), getManagementPort(getServer()));
- } while (serverState == JBoss7ServerState.RUNNING);
+ service.getServerState(managementDetails);
return false;
} catch (JBoss7ManangerConnectException e) {
return true;
@@ -116,42 +169,41 @@
}
}
- public boolean getState() throws PollingException, RequiresInfoException {
- try {
- JBoss7ServerState serverState = service.getServerState(getServer().getHost(), getManagementPort(getServer()));
- return serverState == JBoss7ServerState.RUNNING
- || serverState == JBoss7ServerState.RESTART_REQUIRED;
- } catch (Exception e) {
- throw new PollingException(e.getMessage());
- }
- }
-
public void cleanup() {
JBoss7ManagerUtil.dispose(service);
}
public List<String> getRequiredProperties() {
- return Collections.emptyList();
+ return requiredProperties == null ? new ArrayList<String>() : requiredProperties;
}
public void failureHandled(Properties properties) {
+ requiredPropertiesReturned = properties;
}
public void cancel(int type) {
+ canceled = true;
}
public int getTimeoutBehavior() {
return TIMEOUT_BEHAVIOR_FAIL;
}
+
+ /* Code related to synchronous state checking */
+ private boolean callbacksCalled = false;
public IStatus getCurrentStateSynchronous(final IServer server) {
try {
Boolean result = JBoss7ManagerUtil.executeWithService(new IServiceAware<Boolean>() {
-
@Override
public Boolean execute(IJBoss7ManagerService service) throws Exception {
- JBoss7ServerState state = service.getServerState(server.getHost(), getManagementPort(server));
- return state == JBoss7ServerState.RUNNING ? IServerStatePoller.SERVER_UP : IServerStatePoller.SERVER_DOWN;
+ try {
+ JBoss7ServerState state = service.getServerState(createSynchronousManagementDetails(server));
+ return state == JBoss7ServerState.RUNNING ? IServerStatePoller.SERVER_UP : IServerStatePoller.SERVER_DOWN;
+ } catch(Exception e) {
+ /* Should be JBoss7ManagerException, but cannot compile against since it is in jboss-as jars */
+ return callbacksCalled ? IServerStatePoller.SERVER_UP : IServerStatePoller.SERVER_DOWN;
+ }
}
}, server);
if( result.booleanValue()) {
@@ -171,4 +223,24 @@
return s;
}
}
+
+ private AS7ManagementDetails createSynchronousManagementDetails(IServer server) {
+ return new AS7ManagementDetails(server) {
+ public String[] handleCallbacks(String[] prompts) throws UnsupportedOperationException {
+ // No need to do verification here... simply know that a server responded requesting callbacks
+ // This means a server is up already
+ callbacksCalled = true;
+ throw new UnsupportedOperationException();
+ }
+ };
+ }
+
+ private int getManagementPort(IServer server) {
+ if( server != null ) {
+ JBoss7Server jbossServer = (JBoss7Server) server.loadAdapter(JBoss7Server.class, new NullProgressMonitor());
+ return jbossServer.getManagementPort();
+ }
+ return IJBoss7ManagerService.MGMT_PORT;
+ }
+
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-11-29 14:13:23 UTC (rev 36729)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-11-29 14:52:09 UTC (rev 36730)
@@ -19,6 +19,7 @@
import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate;
+import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails;
import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService;
import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManagerUtil;
import org.jboss.ide.eclipse.as.core.util.PollThreadUtils;
@@ -53,8 +54,7 @@
protected IStatus gracefullStop() {
IServer server = getServer();
try {
- JBoss7Server jbossServer = ServerConverter.checkedGetJBossServer(server, JBoss7Server.class);
- getService().stop(jbossServer.getHost(), jbossServer.getManagementPort());
+ getService().stop(new AS7ManagementDetails(getServer()));
return Status.OK_STATUS;
} catch (Exception e) {
return new Status(
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java 2011-11-29 14:52:09 UTC (rev 36730)
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.core.server.v7.management;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server;
+
+public class AS7ManagementDetails {
+ private IServer server;
+ private String hardHost = null;
+ private int hardPort = -1;
+ public AS7ManagementDetails(IServer server) {
+ this.server = server;
+ }
+
+ public AS7ManagementDetails(String host, int port) {
+ this.hardHost = host;
+ this.hardPort = port;
+ }
+
+ public String getHost() {
+ return hardHost == null ? server.getHost() : hardHost;
+ }
+
+ public int getManagementPort() {
+ if( hardPort != -1 )
+ return hardPort;
+
+ JBoss7Server jbossServer = (JBoss7Server) server.loadAdapter(JBoss7Server.class, new NullProgressMonitor());
+ if( jbossServer != null )
+ return jbossServer.getManagementPort();
+ return IJBoss7ManagerService.MGMT_PORT;
+ }
+
+ public String getManagementUsername() {
+ return null;
+ }
+
+ public String getManagementPassword() {
+ return null;
+ }
+
+ public String[] handleCallbacks(String[] prompts) throws UnsupportedOperationException {
+ return new String[0];
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7ManagerService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7ManagerService.java 2011-11-29 14:13:23 UTC (rev 36729)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7ManagerService.java 2011-11-29 14:52:09 UTC (rev 36730)
@@ -26,98 +26,74 @@
/**
* Asynchronously deploy a file to a server
- * @param host
+ * @param host The host
+ * @param port The port
+ * @param name The deployment's name
+ * @param file The file to be deployed
+ * @param monitor The progress monitor
*
- * The host
- * @param port
- * The port
- * @param name
- * The deployment's name
- * @param file
- * The file to be deployed
- * @param monitor
- * The progress monitor
- *
* @return Not sure what to return yet
* @throws Exception
*/
- public IJBoss7DeploymentResult deployAsync(String host, int port,
+ public IJBoss7DeploymentResult deployAsync(AS7ManagementDetails details,
String deploymentName, File file, IProgressMonitor monitor) throws Exception;
/**
* Synchronously deploy a file to a server
*
- * @param host
- * The host
- * @param port
- * The port
- * @param name
- * The deployment's name
- * @param file
- * The file to be deployed
- * @param monitor
- * The progress monitor
+ * @param host The host
+ * @param port The port
+ * @param name The deployment's name
+ * @param file The file to be deployed
+ * @param monitor The progress monitor
*
* @return Not sure what to return yet
* @throws Exception
*/
- public IJBoss7DeploymentResult deploySync(String host, int port,
+ public IJBoss7DeploymentResult deploySync(AS7ManagementDetails details,
String deploymentName, File file, IProgressMonitor monitor) throws Exception;
/**
* Asynchronously undeploy a file to a server
*
- * @param host
- * The host
- * @param port
- * The port
- * @param name
- * The deployment's name
- * @param file
- * The file to be deployed
- * @param monitor
- * The progress monitor
+ * @param host The host
+ * @param port The port
+ * @param name The deployment's name
+ * @param file The file to be deployed
+ * @param monitor The progress monitor
*
* @return Not sure what to return yet
* @throws Exception
*/
- public IJBoss7DeploymentResult undeployAsync(String host, int port,
+ public IJBoss7DeploymentResult undeployAsync(AS7ManagementDetails details,
String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception;
/**
* Synchronously undeploy a file to a server
*
- * @param host
- * The host
- * @param port
- * The port
- * @param name
- * The deployment's name
- * @param file
- * The file to be deployed
- * @param monitor
- * The progress monitor
+ * @param host The host
+ * @param port The port
+ * @param name The deployment's name
+ * @param file The file to be deployed
+ * @param monitor The progress monitor
*
* @return Not sure what to return yet
* @throws Exception
*/
- public IJBoss7DeploymentResult syncUndeploy(String host, int port,
+ public IJBoss7DeploymentResult syncUndeploy(AS7ManagementDetails details,
String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception;
/**
* Returns the state for a given deployment name on a given host and port.
*
- * @param host
- * the host to query
- * @param port
- * the port to contact it on
- * @param deploymentName
- * the name of the deployment that shall be queried
+ * @param host the host to query
+ * @param port the port to contact it on
+ * @param deploymentName the name of the deployment that shall be queried
*
* @return the state of the deployment
* @throws Exception
*/
- public JBoss7DeploymentState getDeploymentState(String host, int port, String deploymentName) throws Exception;
+ public JBoss7DeploymentState getDeploymentState(AS7ManagementDetails details, String deploymentName) throws Exception;
/**
* Returns the state of the server
@@ -128,7 +104,7 @@
*
* @throws Exception
*/
- public JBoss7ServerState getServerState(String host, int port) throws Exception;
+ public JBoss7ServerState getServerState(AS7ManagementDetails details) throws Exception;
/**
* Returns <code>true</code> if the server is running, <code>false</code>
@@ -139,21 +115,15 @@
* @return true if it's running, false otherwise
* @throws Exception
*/
- public boolean isRunning(String host, int port) throws Exception;
+ public boolean isRunning(AS7ManagementDetails details) throws Exception;
- @Deprecated
- public JBoss7ServerState getServerState(String host) throws Exception;
-
/**
* Stops the given server
*
* @throws JBoss7ManangerException
* @throws Exception
*/
- public void stop(String host, int port) throws Exception;
+ public void stop(AS7ManagementDetails details) throws Exception;
- @Deprecated
- public void stop(String host) throws Exception;
-
public void dispose();
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerServiceProxy.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerServiceProxy.java 2011-11-29 14:13:23 UTC (rev 36729)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerServiceProxy.java 2011-11-29 14:52:09 UTC (rev 36730)
@@ -35,56 +35,46 @@
checkedGetService().init();
}
- public IJBoss7DeploymentResult deployAsync(String host, int port, String deploymentName, File file,
+ public IJBoss7DeploymentResult deployAsync(AS7ManagementDetails details, String deploymentName, File file,
IProgressMonitor monitor) throws Exception {
- return checkedGetService().deployAsync(host, port, deploymentName, file, monitor);
+ return checkedGetService().deployAsync(details, deploymentName, file, monitor);
}
- public IJBoss7DeploymentResult deploySync(String host, int port, String deploymentName, File file,
+ public IJBoss7DeploymentResult deploySync(AS7ManagementDetails details, String deploymentName, File file,
IProgressMonitor monitor) throws Exception {
- return checkedGetService().deployAsync(host, port, deploymentName, file, monitor);
+ return checkedGetService().deployAsync(details, deploymentName, file, monitor);
}
- public IJBoss7DeploymentResult undeployAsync(String host, int port, String deploymentName, boolean removeFile,
+ public IJBoss7DeploymentResult undeployAsync(AS7ManagementDetails details, String deploymentName, boolean removeFile,
IProgressMonitor monitor) throws Exception {
- return checkedGetService().undeployAsync(host, port, deploymentName, removeFile, monitor);
+ return checkedGetService().undeployAsync(details, deploymentName, removeFile, monitor);
}
- public IJBoss7DeploymentResult syncUndeploy(String host, int port, String deploymentName, boolean removeFile,
+ public IJBoss7DeploymentResult syncUndeploy(AS7ManagementDetails details, String deploymentName, boolean removeFile,
IProgressMonitor monitor) throws Exception {
- return checkedGetService().syncUndeploy(host, port, deploymentName, removeFile, monitor);
+ return checkedGetService().syncUndeploy(details, deploymentName, removeFile, monitor);
}
- public JBoss7DeploymentState getDeploymentState(String host, int port, String deploymentName) throws Exception {
- return checkedGetService().getDeploymentState(host, port, deploymentName);
+ public JBoss7DeploymentState getDeploymentState(AS7ManagementDetails details, String deploymentName) throws Exception {
+ return checkedGetService().getDeploymentState(details, deploymentName);
}
- public JBoss7ServerState getServerState(String host, int port) throws Exception {
- return checkedGetService().getServerState(host, port);
+ public JBoss7ServerState getServerState(AS7ManagementDetails details) throws Exception {
+ return checkedGetService().getServerState(details);
}
- public boolean isRunning(String host, int port) throws Exception {
+ public boolean isRunning(AS7ManagementDetails details) throws Exception {
try {
- return checkedGetService().isRunning(host, port);
+ return checkedGetService().isRunning(details);
} catch (Exception e) {
return false;
}
}
- @Deprecated
- public JBoss7ServerState getServerState(String host) throws Exception {
- return checkedGetService().getServerState(host);
+ public void stop(AS7ManagementDetails details) throws Exception {
+ checkedGetService().stop(details);
}
- public void stop(String host, int port) throws Exception {
- checkedGetService().stop(host, port);
- }
-
- @Deprecated
- public void stop(String host) throws Exception {
- checkedGetService().stop(host);
- }
-
private IJBoss7ManagerService checkedGetService() throws JBoss7ManangerException {
IJBoss7ManagerService service = getService();
if (service == null) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java 2011-11-29 14:13:23 UTC (rev 36729)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java 2011-11-29 14:52:09 UTC (rev 36730)
@@ -74,14 +74,6 @@
launchJMXPoller();
}
- @Deprecated
- public void beginPolling(IServer server, boolean expectedState,
- PollThread pt) {
- ceFound = nnfeFound = startingFound = canceled = done = false;
- this.server = server;
- launchJMXPoller();
- }
-
private static class JMXPollerRunnable implements IJMXRunnable {
private boolean result;
public void run(MBeanServerConnection connection) throws Exception {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java 2011-11-29 14:13:23 UTC (rev 36729)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java 2011-11-29 14:52:09 UTC (rev 36730)
@@ -42,6 +42,7 @@
import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentPlanResult;
import org.jboss.as.protocol.old.StreamUtils;
import org.jboss.dmr.ModelNode;
+import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails;
import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7DeploymentResult;
import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState;
import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerException;
@@ -57,13 +58,15 @@
private ModelControllerClient client;
private ServerDeploymentManager manager;
+ private AS7ManagementDetails details;
public AS7Manager(String host) throws UnknownHostException {
- this(host, MGMT_PORT);
+ this(new AS7ManagementDetails(host, MGMT_PORT));
}
- public AS7Manager(String host, int port) throws UnknownHostException {
- this.client = ModelControllerClient.Factory.create(host, port);
+ public AS7Manager(AS7ManagementDetails details) throws UnknownHostException {
+ this.details = details;
+ this.client = ModelControllerClient.Factory.create(details.getHost(), details.getManagementPort());
this.manager = ServerDeploymentManager.Factory.create(client);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java 2011-11-29 14:13:23 UTC (rev 36729)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java 2011-11-29 14:52:09 UTC (rev 36730)
@@ -13,6 +13,7 @@
import java.io.File;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails;
import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7DeploymentResult;
import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService;
import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState;
@@ -26,9 +27,9 @@
public void init() throws Exception {
}
- public IJBoss7DeploymentResult deployAsync(String host, int port, String deploymentName,
+ public IJBoss7DeploymentResult deployAsync(AS7ManagementDetails details, String deploymentName,
File file, IProgressMonitor monitor) throws Exception {
- AS7Manager manager = new AS7Manager(host, port);
+ AS7Manager manager = new AS7Manager(details);
try {
IJBoss7DeploymentResult result = manager.deploy(deploymentName, file);
return result;
@@ -37,9 +38,9 @@
}
}
- public IJBoss7DeploymentResult deploySync(String host, int port, String deploymentName,
+ public IJBoss7DeploymentResult deploySync(AS7ManagementDetails details, String deploymentName,
File file, IProgressMonitor monitor) throws Exception {
- AS7Manager manager = new AS7Manager(host, port);
+ AS7Manager manager = new AS7Manager(details);
try {
IJBoss7DeploymentResult result = manager.deploySync(deploymentName, file, monitor);
return result;
@@ -48,9 +49,9 @@
}
}
- public IJBoss7DeploymentResult undeployAsync(String host, int port, String deploymentName,
+ public IJBoss7DeploymentResult undeployAsync(AS7ManagementDetails details, String deploymentName,
boolean removeFile, IProgressMonitor monitor) throws Exception {
- AS7Manager manager = new AS7Manager(host, port);
+ AS7Manager manager = new AS7Manager(details);
try {
IJBoss7DeploymentResult result = manager.undeploy(deploymentName);
return result;
@@ -59,9 +60,9 @@
}
}
- public IJBoss7DeploymentResult syncUndeploy(String host, int port, String deploymentName,
+ public IJBoss7DeploymentResult syncUndeploy(AS7ManagementDetails details, String deploymentName,
boolean removeFile, IProgressMonitor monitor) throws Exception {
- AS7Manager manager = new AS7Manager(host, port);
+ AS7Manager manager = new AS7Manager(details);
try {
IJBoss7DeploymentResult result = manager.undeploySync(deploymentName, monitor);
return result;
@@ -70,8 +71,8 @@
}
}
- public JBoss7DeploymentState getDeploymentState(String host, int port, String deploymentName) throws Exception {
- AS7Manager manager = new AS7Manager(host, port);
+ public JBoss7DeploymentState getDeploymentState(AS7ManagementDetails details, String deploymentName) throws Exception {
+ AS7Manager manager = new AS7Manager(details);
try {
JBoss7DeploymentState result = manager.getDeploymentStateSafe(deploymentName);
return result;
@@ -80,13 +81,8 @@
}
}
- @Deprecated
- public JBoss7ServerState getServerState(String host) throws Exception {
- return getServerState(host, AS7Manager.MGMT_PORT);
- }
-
- public JBoss7ServerState getServerState(String host, int port) throws Exception {
- AS7Manager manager = new AS7Manager(host, port);
+ public JBoss7ServerState getServerState(AS7ManagementDetails details) throws Exception {
+ AS7Manager manager = new AS7Manager(details);
try {
JBoss7ServerState state = manager.getServerState();
return state;
@@ -95,8 +91,8 @@
}
}
- public boolean isRunning(String host, int port) throws Exception {
- AS7Manager manager = new AS7Manager(host, port);
+ public boolean isRunning(AS7ManagementDetails details) throws Exception {
+ AS7Manager manager = new AS7Manager(details);
try {
boolean ret = manager.isRunning();
return ret;
@@ -105,13 +101,8 @@
}
}
- @Deprecated
- public void stop(String host) throws Exception {
- stop(host, AS7Manager.MGMT_PORT);
- }
-
- public void stop(String host, int port) throws Exception {
- AS7Manager manager = new AS7Manager(host, port);
+ public void stop(AS7ManagementDetails details) throws Exception {
+ AS7Manager manager = new AS7Manager(details);
try {
manager.stopServer();
} finally {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java 2011-11-29 14:13:23 UTC (rev 36729)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java 2011-11-29 14:52:09 UTC (rev 36730)
@@ -38,8 +38,6 @@
import javax.security.auth.callback.NameCallback;
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.sasl.RealmCallback;
-import javax.security.sasl.RealmChoiceCallback;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osgi.util.NLS;
@@ -50,6 +48,7 @@
import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentPlanResult;
import org.jboss.as.protocol.StreamUtils;
import org.jboss.dmr.ModelNode;
+import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails;
import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7DeploymentResult;
import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState;
import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerException;
@@ -65,13 +64,16 @@
private ModelControllerClient client;
private ServerDeploymentManager manager;
-
+ private AS7ManagementDetails details;
+
public AS71Manager(String host) throws UnknownHostException {
- this(host, MGMT_PORT);
+ this(new AS7ManagementDetails(host, MGMT_PORT));
}
- public AS71Manager(String host, int port) throws UnknownHostException {
- this.client = ModelControllerClient.Factory.create(host, port,getCallbackHandler());
+ public AS71Manager(AS7ManagementDetails details) throws UnknownHostException {
+ this.details = details;
+ this.client = ModelControllerClient.Factory.create(details.getHost(), details.getManagementPort(),
+ getCallbackHandler());
this.manager = ServerDeploymentManager.Factory.create(client);
}
@@ -96,11 +98,10 @@
pass = (PasswordCallback) current;
}
}
- // TODO get the username
- String username, password;
- username = password = "test";
- name.setName(username);
- pass.setPassword(password.toCharArray());
+
+ String[] results = details.handleCallbacks(new String[] { name.getPrompt(), pass.getPrompt()});
+ name.setName(results[0]);
+ pass.setPassword(results[1].toCharArray());
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/JBoss71ManagerService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/JBoss71ManagerService.java 2011-11-29 14:13:23 UTC (rev 36729)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/JBoss71ManagerService.java 2011-11-29 14:52:09 UTC (rev 36730)
@@ -14,6 +14,7 @@
import java.security.Security;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails;
import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7DeploymentResult;
import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService;
import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState;
@@ -32,9 +33,9 @@
}
}
- public IJBoss7DeploymentResult deployAsync(String host, int port, String deploymentName,
+ public IJBoss7DeploymentResult deployAsync(AS7ManagementDetails details, String deploymentName,
File file, IProgressMonitor monitor) throws Exception {
- AS71Manager manager = new AS71Manager(host, port);
+ AS71Manager manager = new AS71Manager(details);
try {
IJBoss7DeploymentResult result = manager.deploy(deploymentName, file);
return result;
@@ -43,9 +44,9 @@
}
}
- public IJBoss7DeploymentResult deploySync(String host, int port, String deploymentName,
+ public IJBoss7DeploymentResult deploySync(AS7ManagementDetails details, String deploymentName,
File file, IProgressMonitor monitor) throws Exception {
- AS71Manager manager = new AS71Manager(host, port);
+ AS71Manager manager = new AS71Manager(details);
try {
IJBoss7DeploymentResult result = manager.deploySync(deploymentName, file, monitor);
return result;
@@ -54,9 +55,9 @@
}
}
- public IJBoss7DeploymentResult undeployAsync(String host, int port, String deploymentName,
+ public IJBoss7DeploymentResult undeployAsync(AS7ManagementDetails details, String deploymentName,
boolean removeFile, IProgressMonitor monitor) throws Exception {
- AS71Manager manager = new AS71Manager(host, port);
+ AS71Manager manager = new AS71Manager(details);
try {
IJBoss7DeploymentResult result = manager.undeploy(deploymentName);
return result;
@@ -65,9 +66,9 @@
}
}
- public IJBoss7DeploymentResult syncUndeploy(String host, int port, String deploymentName,
+ public IJBoss7DeploymentResult syncUndeploy(AS7ManagementDetails details, String deploymentName,
boolean removeFile, IProgressMonitor monitor) throws Exception {
- AS71Manager manager = new AS71Manager(host, port);
+ AS71Manager manager = new AS71Manager(details);
try {
IJBoss7DeploymentResult result = manager.undeploySync(deploymentName, monitor);
return result;
@@ -76,8 +77,8 @@
}
}
- public JBoss7DeploymentState getDeploymentState(String host, int port, String deploymentName) throws Exception {
- AS71Manager manager = new AS71Manager(host, port);
+ public JBoss7DeploymentState getDeploymentState(AS7ManagementDetails details, String deploymentName) throws Exception {
+ AS71Manager manager = new AS71Manager(details);
try {
JBoss7DeploymentState result = manager.getDeploymentStateSafe(deploymentName);
return result;
@@ -86,13 +87,8 @@
}
}
- @Deprecated
- public JBoss7ServerState getServerState(String host) throws Exception {
- return getServerState(host, AS71Manager.MGMT_PORT);
- }
-
- public JBoss7ServerState getServerState(String host, int port) throws Exception {
- AS71Manager manager = new AS71Manager(host, port);
+ public JBoss7ServerState getServerState(AS7ManagementDetails details) throws Exception {
+ AS71Manager manager = new AS71Manager(details);
try {
JBoss7ServerState state = manager.getServerState();
return state;
@@ -101,8 +97,8 @@
}
}
- public boolean isRunning(String host, int port) throws Exception {
- AS71Manager manager = new AS71Manager(host, port);
+ public boolean isRunning(AS7ManagementDetails details) throws Exception {
+ AS71Manager manager = new AS71Manager(details);
try {
boolean ret = manager.isRunning();
return ret;
@@ -111,13 +107,8 @@
}
}
- @Deprecated
- public void stop(String host) throws Exception {
- stop(host, AS71Manager.MGMT_PORT);
- }
-
- public void stop(String host, int port) throws Exception {
- AS71Manager manager = new AS71Manager(host, port);
+ public void stop(AS7ManagementDetails details) throws Exception {
+ AS71Manager manager = new AS71Manager(details);
try {
manager.stopServer();
} finally {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-11-29 14:13:23 UTC (rev 36729)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-11-29 14:52:09 UTC (rev 36730)
@@ -19,10 +19,9 @@
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server;
+import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails;
import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService;
import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManagerUtil;
-import org.jboss.ide.eclipse.as.core.util.ServerConverter;
public class RSEJBoss7BehaviourDelegate extends RSEBehaviourDelegate {
@@ -32,8 +31,7 @@
protected IStatus gracefullStop() {
IServer server = getServer();
try {
- JBoss7Server jbossServer = ServerConverter.checkedGetJBossServer(server, JBoss7Server.class);
- getService().stop(jbossServer.getHost(), jbossServer.getManagementPort());
+ getService().stop(new AS7ManagementDetails(server));
return Status.OK_STATUS;
} catch (Exception e) {
return new Status(
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java 2011-11-29 14:13:23 UTC (rev 36729)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java 2011-11-29 14:52:09 UTC (rev 36730)
@@ -42,6 +42,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.JBossLaunchAdapter.JBTCustomHttpLaunchable;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server;
+import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails;
import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService;
import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState;
import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManagerUtil;
@@ -108,7 +109,8 @@
long time = new Date().getTime();
long endTime = time + getMaxDelay();
while( new Date().getTime() < endTime ) {
- JBoss7DeploymentState state = service.getDeploymentState(jbossServer.getHost(), jbossServer.getManagementPort(),
+ JBoss7DeploymentState state = service.getDeploymentState(
+ new AS7ManagementDetails(server),
deployPath.lastSegment());
boolean done = (state == JBoss7DeploymentState.STARTED);
if( done ) {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java 2011-11-29 14:13:23 UTC (rev 36729)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java 2011-11-29 14:52:09 UTC (rev 36730)
@@ -17,6 +17,7 @@
import java.util.Hashtable;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails;
import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7DeploymentResult;
import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService;
import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState;
@@ -60,7 +61,7 @@
managerProxy.open();
IJBoss7ManagerService manager = managerProxy.getService();
assertNotNull(manager);
- manager.getDeploymentState("fake", 4242, "fake");
+ manager.getDeploymentState(new AS7ManagementDetails("fake", 4242), "fake");
}
private void registerFakeASService(String version) {
@@ -72,49 +73,42 @@
private static class JBoss71Manager implements IJBoss7ManagerService {
- public IJBoss7DeploymentResult deployAsync(String host, int port, String deploymentName, File file,
+ public IJBoss7DeploymentResult deployAsync(AS7ManagementDetails details, String deploymentName, File file,
IProgressMonitor monitor) throws JBoss7ManangerException {
throw new UnsupportedOperationException();
}
- public IJBoss7DeploymentResult deploySync(String host, int port, String deploymentName, File file,
+ public IJBoss7DeploymentResult deploySync(AS7ManagementDetails details, String deploymentName, File file,
IProgressMonitor monitor) throws JBoss7ManangerException {
throw new UnsupportedOperationException();
}
- public IJBoss7DeploymentResult undeployAsync(String host, int port, String deploymentName, boolean removeFile,
+ public IJBoss7DeploymentResult undeployAsync(AS7ManagementDetails details, String deploymentName, boolean removeFile,
IProgressMonitor monitor) throws JBoss7ManangerException {
throw new UnsupportedOperationException();
}
- public IJBoss7DeploymentResult syncUndeploy(String host, int port, String deploymentName, boolean removeFile,
+ public IJBoss7DeploymentResult syncUndeploy(AS7ManagementDetails details, String deploymentName, boolean removeFile,
IProgressMonitor monitor) throws JBoss7ManangerException {
throw new UnsupportedOperationException();
}
- public JBoss7DeploymentState getDeploymentState(String host, int port, String deploymentName)
+ public JBoss7DeploymentState getDeploymentState(AS7ManagementDetails details, String deploymentName)
throws JBoss7ManangerException {
throw new UnsupportedOperationException();
}
- public JBoss7ServerState getServerState(String host, int port) throws Exception {
+ public JBoss7ServerState getServerState(AS7ManagementDetails details) throws Exception {
throw new UnsupportedOperationException();
}
- public JBoss7ServerState getServerState(String host) throws Exception {
+ public boolean isRunning(AS7ManagementDetails details) {
throw new UnsupportedOperationException();
}
- public boolean isRunning(String host, int port) {
- throw new UnsupportedOperationException();
+ public void stop(AS7ManagementDetails details) throws JBoss7ManangerException {
}
- public void stop(String host, int port) throws JBoss7ManangerException {
- }
-
- public void stop(String host) throws JBoss7ManangerException {
- }
-
public void dispose() {
}
14 years
JBoss Tools SVN: r36729 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test: jsf and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: ljelinko
Date: 2011-11-29 09:13:23 -0500 (Tue, 29 Nov 2011)
New Revision: 36729
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java
Log:
added check for non existing files
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java 2011-11-29 14:11:20 UTC (rev 36728)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java 2011-11-29 14:13:23 UTC (rev 36729)
@@ -46,4 +46,9 @@
public List<String> getExpectedFiles() {
return Arrays.asList(WEB_XML, PORTLET_XML, PORTLET_LIBRARIES);
}
+
+ @Override
+ public List<String> getNonExpectedFiles() {
+ return Arrays.asList(FACES_CONFIG_XML, WEB_APP_LIBRARIES, PAGES_XML, COMPONENTS_XML, JBOSS_WEB_XML);
+ }
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java 2011-11-29 14:11:20 UTC (rev 36728)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java 2011-11-29 14:13:23 UTC (rev 36729)
@@ -52,4 +52,9 @@
public List<String> getExpectedFiles() {
return Arrays.asList(WEB_XML, PORTLET_XML, PORTLET_LIBRARIES, FACES_CONFIG_XML, WEB_APP_LIBRARIES);
}
+
+ @Override
+ public List<String> getNonExpectedFiles() {
+ return Arrays.asList(PAGES_XML, COMPONENTS_XML, JBOSS_WEB_XML);
+ }
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java 2011-11-29 14:11:20 UTC (rev 36728)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java 2011-11-29 14:13:23 UTC (rev 36729)
@@ -2,6 +2,7 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.jboss.tools.portlet.ui.bot.entity.FacetDefinition;
@@ -79,4 +80,9 @@
COMPONENTS_XML,
JBOSS_WEB_XML);
}
+
+ @Override
+ public List<String> getNonExpectedFiles() {
+ return Collections.emptyList();
+ }
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2011-11-29 14:11:20 UTC (rev 36728)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2011-11-29 14:13:23 UTC (rev 36729)
@@ -1,5 +1,6 @@
package org.jboss.tools.portlet.ui.bot.test.template;
+import static org.hamcrest.Matchers.not;
import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors;
import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.exist;
import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.hasFacets;
@@ -16,9 +17,7 @@
import org.jboss.tools.portlet.ui.bot.task.wizard.web.DynamicWebProjectCreationTask;
import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.config.Annotations.DB;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Seam;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
@@ -73,6 +72,8 @@
public abstract List<WizardPageFillingTask> getAdditionalWizardPages();
public abstract List<String> getExpectedFiles();
+
+ public abstract List<String> getNonExpectedFiles();
@Test
public void testcreate(){
@@ -82,6 +83,9 @@
doAssertThat(getProjectName(), isExistingProject());
doAssertThat(getProjectName(), hasFacets(getRequiredFacets()));
doAssertThat(getExpectedWorkspaceFiles(), exist());
+ if (getNonExpectedFiles().size() > 0){
+ doAssertThat(getNonExpectedWorkspaceFiles(), not(exist()));
+ }
}
protected AbstractSWTTask getCreateDynamicWebProjectTask() {
@@ -101,12 +105,20 @@
}
private List<WorkspaceFile> getExpectedWorkspaceFiles(){
- List<WorkspaceFile> expectedWorkspaceFiles = new ArrayList<WorkspaceFile>();
+ return wrap(getExpectedFiles());
+ }
+
+ private List<WorkspaceFile> getNonExpectedWorkspaceFiles(){
+ return wrap(getNonExpectedFiles());
+ }
+
+ private List<WorkspaceFile> wrap(List<String> files){
+ List<WorkspaceFile> workspaceFiles = new ArrayList<WorkspaceFile>();
- for (String file : getExpectedFiles()){
- expectedWorkspaceFiles.add(new WorkspaceFile(getProjectName(), file));
+ for (String file : files){
+ workspaceFiles.add(new WorkspaceFile(getProjectName(), file));
}
- return expectedWorkspaceFiles;
+ return workspaceFiles;
}
}
14 years
JBoss Tools SVN: r36728 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper.
by jbosstools-commits@lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-11-29 09:11:20 -0500 (Tue, 29 Nov 2011)
New Revision: 36728
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java
Log:
Support Context Menu within SWTBotEditor.
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java 2011-11-29 13:50:59 UTC (rev 36727)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java 2011-11-29 14:11:20 UTC (rev 36728)
@@ -32,6 +32,7 @@
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.swt.widgets.Widget;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
import org.eclipse.swtbot.swt.finder.results.Result;
@@ -322,6 +323,37 @@
clickContextMenu(parentControl, texts);
}
+ /**
+ * Clicks the context menu matching the text.
+ * @param editor editor containing requested Context Menu
+ * @param index index of StyledText widget containing requested
+ * Context Menu within editor
+ * @param text
+ * the text on the context menu.
+ * @throws WidgetNotFoundException
+ * if the widget is not found.
+ */
+ public static void clickContextMenu(final SWTBotEditor editor,
+ int index,
+ final String... texts) {
+ editor.setFocus();
+ clickContextMenu(editor.bot().styledText(index), texts);
+
+ }
+ /**
+ * Clicks the context menu matching the text.
+ * @param editor editor containing requested Context Menu
+ * @param text
+ * the text on the context menu.
+ * @throws WidgetNotFoundException
+ * if the widget is not found.
+ */
+ public static void clickContextMenu(final SWTBotEditor editor,
+ final String... texts) {
+
+ clickContextMenu(editor,0, texts);
+
+ }
private static void click(final MenuItem menuItem) {
final Event event = new Event();
14 years
JBoss Tools SVN: r36727 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test: template and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: ljelinko
Date: 2011-11-29 08:50:59 -0500 (Tue, 29 Nov 2011)
New Revision: 36727
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java
Log:
changed the @Require annotation so that seam is created only for seam tests
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java 2011-11-29 13:04:35 UTC (rev 36726)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java 2011-11-29 13:50:59 UTC (rev 36727)
@@ -12,6 +12,12 @@
import org.jboss.tools.portlet.ui.bot.task.wizard.web.seam.Seam2FacetWizardPageFillingTask;
import org.jboss.tools.portlet.ui.bot.test.template.CreatePortletProjectTemplate;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.config.Annotations.DB;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Seam;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
/**
@@ -20,6 +26,7 @@
* @author Lucia Jelinkova
*
*/
+@Require(db=@DB(required=true), seam=@Seam(version="2.2"), server=@Server(required=true, state=ServerState.Present, type=ServerType.EPP))
public class CreateSeamPortletProject extends CreatePortletProjectTemplate{
public static final String PROJECT_NAME = "seam-portlet";
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2011-11-29 13:04:35 UTC (rev 36726)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2011-11-29 13:50:59 UTC (rev 36727)
@@ -31,7 +31,7 @@
* @author Lucia Jelinkova
*
*/
-@Require(db=@DB(required=true), seam=@Seam(version="2.2"), server=@Server(required=true, state=ServerState.Present, type=ServerType.EPP))
+@Require(server=@Server(required=true, state=ServerState.Present, type=ServerType.EPP))
public abstract class CreatePortletProjectTemplate extends SWTTaskBasedTestCase {
protected static final FacetDefinition JAVA_FACET = new FacetDefinition("Java", null, "1.6");
14 years
JBoss Tools SVN: r36726 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test: jsf and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: ljelinko
Date: 2011-11-29 08:04:35 -0500 (Tue, 29 Nov 2011)
New Revision: 36726
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortlet.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/RunSeamPortletOnServer.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletTemplate.java
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/SeamPortletTestSuite.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortlet.java
Log:
created new seam tests
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2011-11-29 13:04:11 UTC (rev 36725)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2011-11-29 13:04:35 UTC (rev 36726)
@@ -6,7 +6,9 @@
import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortlet;
import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject;
import org.jboss.tools.portlet.ui.bot.test.jsf.RunJSFPortletOnServer;
+import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortlet;
import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletProject;
+import org.jboss.tools.portlet.ui.bot.test.seam.RunSeamPortletOnServer;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -18,7 +20,9 @@
CreateJSFPortletProject.class,
CreateJSFPortlet.class,
RunJSFPortletOnServer.class,
- CreateSeamPortletProject.class
+ CreateSeamPortletProject.class,
+ CreateSeamPortlet.class,
+ RunSeamPortletOnServer.class
})
public class AllTestsSuite {
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/SeamPortletTestSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/SeamPortletTestSuite.java 2011-11-29 13:04:11 UTC (rev 36725)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/SeamPortletTestSuite.java 2011-11-29 13:04:35 UTC (rev 36726)
@@ -1,12 +1,16 @@
package org.jboss.tools.portlet.ui.bot.test;
+import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortlet;
import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletProject;
+import org.jboss.tools.portlet.ui.bot.test.seam.RunSeamPortletOnServer;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(RequirementAwareUsageWindowClosingSuite.class)
@Suite.SuiteClasses({
CreateSeamPortletProject.class,
+ CreateSeamPortlet.class,
+ RunSeamPortletOnServer.class
})
public class SeamPortletTestSuite {
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortlet.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortlet.java 2011-11-29 13:04:11 UTC (rev 36725)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortlet.java 2011-11-29 13:04:35 UTC (rev 36726)
@@ -2,58 +2,18 @@
import static org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject.PROJECT_NAME;
-import java.util.Arrays;
-import java.util.List;
+import org.jboss.tools.portlet.ui.bot.test.template.CreateJSFSeamPortletTemplate;
-import org.jboss.tools.portlet.ui.bot.entity.XMLNode;
-import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageDefaultsFillingTask;
-import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.AbstractPortletCreationTask;
-import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JSFPortletCreationTask;
-import org.jboss.tools.portlet.ui.bot.test.template.CreatePortletTemplate;
-
/**
* Creates a new jsf portlet and checks if the right files are generated.
*
* @author Lucia Jelinkova
*
*/
-public class CreateJSFPortlet extends CreatePortletTemplate {
+public class CreateJSFPortlet extends CreateJSFSeamPortletTemplate {
- private static final String FACES_CLASS_NAME = "javax.portlet.faces.GenericFacesPortlet";
-
@Override
protected String getProjectName() {
return PROJECT_NAME;
}
-
- @Override
- protected AbstractPortletCreationTask getCreatePortletTask() {
- JSFPortletCreationTask task = new JSFPortletCreationTask();
- task.addWizardPage(new WizardPageDefaultsFillingTask());
- task.addWizardPage(new WizardPageDefaultsFillingTask());
- return task;
- }
-
- @Override
- protected List<String> getExpectedFiles() {
- return Arrays.asList(
- JSF_FOLDER + "edit.jsp",
- JSF_FOLDER + "view.jsp",
- JSF_FOLDER + "help.jsp"
- );
- }
-
- @Override
- protected List<String> getNonExpectedFiles() {
- return Arrays.asList(
- DEFAULT_OBJECTS_XML,
- PORTLET_INSTANCES_XML,
- JBOSS_APP_XML,
- JBOSS_PORTLET_XML);
- }
-
- @Override
- protected List<XMLNode> getExpectedXMLNodes() {
- return Arrays.asList(new XMLNode("portlet-app/portlet/portlet-class", FACES_CLASS_NAME));
- }
}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortlet.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortlet.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortlet.java 2011-11-29 13:04:35 UTC (rev 36726)
@@ -0,0 +1,19 @@
+package org.jboss.tools.portlet.ui.bot.test.seam;
+
+import static org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletProject.PROJECT_NAME;
+
+import org.jboss.tools.portlet.ui.bot.test.template.CreateJSFSeamPortletTemplate;
+
+/**
+ * Creates a new seam portlet and checks if the right files are generated.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class CreateSeamPortlet extends CreateJSFSeamPortletTemplate {
+
+ @Override
+ protected String getProjectName() {
+ return PROJECT_NAME;
+ }
+}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/RunSeamPortletOnServer.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/RunSeamPortletOnServer.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/RunSeamPortletOnServer.java 2011-11-29 13:04:35 UTC (rev 36726)
@@ -0,0 +1,20 @@
+package org.jboss.tools.portlet.ui.bot.test.seam;
+
+import static org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletProject.PROJECT_NAME;
+
+import org.jboss.tools.portlet.ui.bot.test.template.RunPortletOnServerTemplate;
+
+/**
+ * Performs Run on Server on the jsf portlet project and checks if there is no exception in the
+ * console.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class RunSeamPortletOnServer extends RunPortletOnServerTemplate {
+
+ @Override
+ protected String getProjectName() {
+ return PROJECT_NAME;
+ }
+}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletTemplate.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletTemplate.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletTemplate.java 2011-11-29 13:04:35 UTC (rev 36726)
@@ -0,0 +1,51 @@
+package org.jboss.tools.portlet.ui.bot.test.template;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.jboss.tools.portlet.ui.bot.entity.XMLNode;
+import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageDefaultsFillingTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.AbstractPortletCreationTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JSFPortletCreationTask;
+
+/**
+ * Creates a new jsf portlet and checks if the right files are generated.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class CreateJSFSeamPortletTemplate extends CreatePortletTemplate {
+
+ private static final String FACES_CLASS_NAME = "javax.portlet.faces.GenericFacesPortlet";
+
+ @Override
+ protected AbstractPortletCreationTask getCreatePortletTask() {
+ JSFPortletCreationTask task = new JSFPortletCreationTask();
+ task.addWizardPage(new WizardPageDefaultsFillingTask());
+ task.addWizardPage(new WizardPageDefaultsFillingTask());
+ return task;
+ }
+
+ @Override
+ protected List<String> getExpectedFiles() {
+ return Arrays.asList(
+ JSF_FOLDER + "edit.jsp",
+ JSF_FOLDER + "view.jsp",
+ JSF_FOLDER + "help.jsp"
+ );
+ }
+
+ @Override
+ protected List<String> getNonExpectedFiles() {
+ return Arrays.asList(
+ DEFAULT_OBJECTS_XML,
+ PORTLET_INSTANCES_XML,
+ JBOSS_APP_XML,
+ JBOSS_PORTLET_XML);
+ }
+
+ @Override
+ protected List<XMLNode> getExpectedXMLNodes() {
+ return Arrays.asList(new XMLNode("portlet-app/portlet/portlet-class", FACES_CLASS_NAME));
+ }
+}
14 years
JBoss Tools SVN: r36725 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console.
by jbosstools-commits@lists.jboss.org
Author: ljelinko
Date: 2011-11-29 08:04:11 -0500 (Tue, 29 Nov 2011)
New Revision: 36725
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ConsoleOutputMatcher.java
Log:
fixed nullpointer
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ConsoleOutputMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ConsoleOutputMatcher.java 2011-11-29 12:28:02 UTC (rev 36724)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ConsoleOutputMatcher.java 2011-11-29 13:04:11 UTC (rev 36725)
@@ -17,6 +17,9 @@
@Override
public boolean matchesSafely(String item) {
consoleText = SWTBotFactory.getConsole().getConsoleText();
+ if (consoleText == null){
+ consoleText = "";
+ }
return consoleText.contains(item);
}
14 years
JBoss Tools SVN: r36724 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-11-29 07:28:02 -0500 (Tue, 29 Nov 2011)
New Revision: 36724
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
Log:
[JBIDE-10265] refreshing the application list after embedding
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-11-29 12:20:13 UTC (rev 36723)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-11-29 12:28:02 UTC (rev 36724)
@@ -337,7 +337,14 @@
@Override
public void widgetSelected(SelectionEvent e) {
- WizardUtils.openWizardDialog(new EmbedCartridgeWizard(model.getSelectedApplication(), model.getUser()), getShell());
+ WizardUtils.openWizardDialog(
+ new EmbedCartridgeWizard(model.getSelectedApplication(), model.getUser()), getShell());
+ try {
+ final Collection<IApplication> applications = model.getApplications();
+ setViewerInput(applications);
+ } catch (OpenShiftException ex) {
+ Logger.error(NLS.bind("Could not load the availabel applications", ex));
+ }
}
};
}
14 years