You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ri...@apache.org on 2008/03/24 03:33:26 UTC
svn commit: r640293 - in /continuum/sandbox/continuum-eclipse-plugin:
.classpath .project META-INF/MANIFEST.MF build.properties
src/org/apache/continuum/ui/views/ProjectListViewer.java
src/org/apache/continuum/ui/wizard/CreateConnectionProfileWizard.java
Author: rinku
Date: Sun Mar 23 19:33:25 2008
New Revision: 640293
URL: http://svn.apache.org/viewvc?rev=640293&view=rev
Log:
sync
Modified:
continuum/sandbox/continuum-eclipse-plugin/.classpath
continuum/sandbox/continuum-eclipse-plugin/.project
continuum/sandbox/continuum-eclipse-plugin/META-INF/MANIFEST.MF
continuum/sandbox/continuum-eclipse-plugin/build.properties
continuum/sandbox/continuum-eclipse-plugin/src/org/apache/continuum/ui/views/ProjectListViewer.java
continuum/sandbox/continuum-eclipse-plugin/src/org/apache/continuum/ui/wizard/CreateConnectionProfileWizard.java
Modified: continuum/sandbox/continuum-eclipse-plugin/.classpath
URL: http://svn.apache.org/viewvc/continuum/sandbox/continuum-eclipse-plugin/.classpath?rev=640293&r1=640292&r2=640293&view=diff
==============================================================================
--- continuum/sandbox/continuum-eclipse-plugin/.classpath (original)
+++ continuum/sandbox/continuum-eclipse-plugin/.classpath Sun Mar 23 19:33:25 2008
@@ -5,17 +5,17 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="lib" path="continuum-model-1.1.jar"/>
- <classpathentry kind="lib" path="plexus-component-api-1.0-alpha-20.jar" sourcepath="C:\repository\org\codehaus\plexus\plexus-component-api\1.0-alpha-20\plexus-component-api-1.0-alpha-20-sources.jar"/>
- <classpathentry kind="lib" path="junit-3.8.1.jar" sourcepath="C:\repository\junit\junit\3.8.1\junit-3.8.1-sources.jar"/>
- <classpathentry kind="lib" path="plexus-classworlds-1.2-alpha-7.jar" sourcepath="C:\repository\org\codehaus\plexus\plexus-classworlds\1.2-alpha-7\plexus-classworlds-1.2-alpha-7-sources.jar"/>
- <classpathentry kind="lib" path="plexus-container-default-1.0-alpha-20.jar" sourcepath="C:\repository\org\codehaus\plexus\plexus-container-default\1.0-alpha-20\plexus-container-default-1.0-alpha-20-sources.jar"/>
- <classpathentry kind="lib" path="plexus-utils-1.3.jar" sourcepath="C:\repository\org\codehaus\plexus\plexus-utils\1.3\plexus-utils-1.3-sources.jar"/>
- <classpathentry kind="lib" path="stax-utils-20060502.jar" sourcepath="C:\repository\net\java\dev\stax-utils\stax-utils\20060502\stax-utils-20060502-sources.jar"/>
+ <classpathentry kind="lib" path="plexus-component-api-1.0-alpha-20.jar" sourcepath="Z:\repository\org\codehaus\plexus\plexus-component-api\1.0-alpha-20\plexus-component-api-1.0-alpha-20-sources.jar"/>
+ <classpathentry kind="lib" path="junit-3.8.1.jar" sourcepath="Z:\repository\junit\junit\3.8.1\junit-3.8.1-sources.jar"/>
+ <classpathentry kind="lib" path="plexus-classworlds-1.2-alpha-7.jar" sourcepath="Z:\repository\org\codehaus\plexus\plexus-classworlds\1.2-alpha-7\plexus-classworlds-1.2-alpha-7-sources.jar"/>
+ <classpathentry kind="lib" path="plexus-container-default-1.0-alpha-20.jar" sourcepath="Z:\repository\org\codehaus\plexus\plexus-container-default\1.0-alpha-20\plexus-container-default-1.0-alpha-20-sources.jar"/>
+ <classpathentry kind="lib" path="plexus-utils-1.3.jar" sourcepath="Z:\repository\org\codehaus\plexus\plexus-utils\1.3\plexus-utils-1.3-sources.jar"/>
+ <classpathentry kind="lib" path="stax-utils-20060502.jar" sourcepath="Z:\repository\net\java\dev\stax-utils\stax-utils\20060502\stax-utils-20060502-sources.jar"/>
<classpathentry kind="lib" path="stax-api-1.0.1.jar"/>
<classpathentry kind="lib" path="continuum-xmlrpc-api-1.1.jar"/>
- <classpathentry kind="lib" path="xmlrpc-common-3.0.jar" sourcepath="C:\repository\org\apache\xmlrpc\xmlrpc-common\3.0\xmlrpc-common-3.0-sources.jar"/>
- <classpathentry kind="lib" path="ws-commons-util-1.0.1.jar" sourcepath="C:\repository\org\apache\ws\commons\ws-commons-util\1.0.1\ws-commons-util-1.0.1-sources.jar"/>
- <classpathentry kind="lib" path="xml-apis-1.0.b2.jar" sourcepath="C:\repository\xml-apis\xml-apis\1.0.b2\xml-apis-1.0.b2-sources.jar"/>
+ <classpathentry kind="lib" path="xmlrpc-common-3.0.jar" sourcepath="Z:\repository\org\apache\xmlrpc\xmlrpc-common\3.0\xmlrpc-common-3.0-sources.jar"/>
+ <classpathentry kind="lib" path="ws-commons-util-1.0.1.jar" sourcepath="Z:\repository\org\apache\ws\commons\ws-commons-util\1.0.1\ws-commons-util-1.0.1-sources.jar"/>
+ <classpathentry kind="lib" path="xml-apis-1.0.b2.jar" sourcepath="Z:\repository\xml-apis\xml-apis\1.0.b2\xml-apis-1.0.b2-sources.jar"/>
<classpathentry kind="lib" path="continuum-xmlrpc-client-1.1.jar"/>
- <classpathentry kind="lib" path="xmlrpc-client-3.0.jar" sourcepath="C:\repository\org\apache\xmlrpc\xmlrpc-client\3.0\xmlrpc-client-3.0-sources.jar"/>
+ <classpathentry kind="lib" path="xmlrpc-client-3.0.jar" sourcepath="Z:\repository\org\apache\xmlrpc\xmlrpc-client\3.0\xmlrpc-client-3.0-sources.jar"/>
</classpath>
Modified: continuum/sandbox/continuum-eclipse-plugin/.project
URL: http://svn.apache.org/viewvc/continuum/sandbox/continuum-eclipse-plugin/.project?rev=640293&r1=640292&r2=640293&view=diff
==============================================================================
--- continuum/sandbox/continuum-eclipse-plugin/.project (original)
+++ continuum/sandbox/continuum-eclipse-plugin/.project Sun Mar 23 19:33:25 2008
@@ -29,72 +29,72 @@
<link>
<name>continuum-model-1.1.jar</name>
<type>1</type>
- <location>C:/repository/org/apache/maven/continuum/continuum-model/1.1/continuum-model-1.1.jar</location>
+ <location>Z:/repository/org/apache/maven/continuum/continuum-model/1.1/continuum-model-1.1.jar</location>
</link>
<link>
<name>continuum-xmlrpc-api-1.1.jar</name>
<type>1</type>
- <location>C:/repository/org/apache/maven/continuum/continuum-xmlrpc-api/1.1/continuum-xmlrpc-api-1.1.jar</location>
+ <location>Z:/repository/org/apache/maven/continuum/continuum-xmlrpc-api/1.1/continuum-xmlrpc-api-1.1.jar</location>
</link>
<link>
<name>continuum-xmlrpc-client-1.1.jar</name>
<type>1</type>
- <location>C:/repository/org/apache/maven/continuum/continuum-xmlrpc-client/1.1/continuum-xmlrpc-client-1.1.jar</location>
+ <location>Z:/repository/org/apache/maven/continuum/continuum-xmlrpc-client/1.1/continuum-xmlrpc-client-1.1.jar</location>
</link>
<link>
<name>junit-3.8.1.jar</name>
<type>1</type>
- <location>C:/repository/junit/junit/3.8.1/junit-3.8.1.jar</location>
+ <location>Z:/repository/junit/junit/3.8.1/junit-3.8.1.jar</location>
</link>
<link>
<name>plexus-classworlds-1.2-alpha-7.jar</name>
<type>1</type>
- <location>C:/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar</location>
+ <location>Z:/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar</location>
</link>
<link>
<name>plexus-component-api-1.0-alpha-20.jar</name>
<type>1</type>
- <location>C:/repository/org/codehaus/plexus/plexus-component-api/1.0-alpha-20/plexus-component-api-1.0-alpha-20.jar</location>
+ <location>Z:/repository/org/codehaus/plexus/plexus-component-api/1.0-alpha-20/plexus-component-api-1.0-alpha-20.jar</location>
</link>
<link>
<name>plexus-container-default-1.0-alpha-20.jar</name>
<type>1</type>
- <location>C:/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.jar</location>
+ <location>Z:/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.jar</location>
</link>
<link>
<name>plexus-utils-1.3.jar</name>
<type>1</type>
- <location>C:/repository/org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.jar</location>
+ <location>Z:/repository/org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.jar</location>
</link>
<link>
<name>stax-api-1.0.1.jar</name>
<type>1</type>
- <location>C:/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar</location>
+ <location>Z:/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar</location>
</link>
<link>
<name>stax-utils-20060502.jar</name>
<type>1</type>
- <location>C:/repository/net/java/dev/stax-utils/stax-utils/20060502/stax-utils-20060502.jar</location>
+ <location>Z:/repository/net/java/dev/stax-utils/stax-utils/20060502/stax-utils-20060502.jar</location>
</link>
<link>
<name>ws-commons-util-1.0.1.jar</name>
<type>1</type>
- <location>C:/repository/org/apache/ws/commons/ws-commons-util/1.0.1/ws-commons-util-1.0.1.jar</location>
+ <location>Z:/repository/org/apache/ws/commons/ws-commons-util/1.0.1/ws-commons-util-1.0.1.jar</location>
</link>
<link>
<name>xml-apis-1.0.b2.jar</name>
<type>1</type>
- <location>C:/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar</location>
+ <location>Z:/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar</location>
</link>
<link>
<name>xmlrpc-client-3.0.jar</name>
<type>1</type>
- <location>C:/repository/org/apache/xmlrpc/xmlrpc-client/3.0/xmlrpc-client-3.0.jar</location>
+ <location>Z:/repository/org/apache/xmlrpc/xmlrpc-client/3.0/xmlrpc-client-3.0.jar</location>
</link>
<link>
<name>xmlrpc-common-3.0.jar</name>
<type>1</type>
- <location>C:/repository/org/apache/xmlrpc/xmlrpc-common/3.0/xmlrpc-common-3.0.jar</location>
+ <location>Z:/repository/org/apache/xmlrpc/xmlrpc-common/3.0/xmlrpc-common-3.0.jar</location>
</link>
</linkedResources>
</projectDescription>
Modified: continuum/sandbox/continuum-eclipse-plugin/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/continuum/sandbox/continuum-eclipse-plugin/META-INF/MANIFEST.MF?rev=640293&r1=640292&r2=640293&view=diff
==============================================================================
--- continuum/sandbox/continuum-eclipse-plugin/META-INF/MANIFEST.MF (original)
+++ continuum/sandbox/continuum-eclipse-plugin/META-INF/MANIFEST.MF Sun Mar 23 19:33:25 2008
@@ -14,11 +14,7 @@
org.eclipse.core.runtime,
org.eclipse.ui.forms,
org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.emf.edit.ui,
org.eclipse.ui.views.properties.tabbed
Bundle-Name: Continuum Eclipse Plugin
Bundle-Localization: plugin
Modified: continuum/sandbox/continuum-eclipse-plugin/build.properties
URL: http://svn.apache.org/viewvc/continuum/sandbox/continuum-eclipse-plugin/build.properties?rev=640293&r1=640292&r2=640293&view=diff
==============================================================================
--- continuum/sandbox/continuum-eclipse-plugin/build.properties (original)
+++ continuum/sandbox/continuum-eclipse-plugin/build.properties Sun Mar 23 19:33:25 2008
@@ -4,71 +4,4 @@
META-INF/,\
.,\
icons/,\
- lib/classworlds-1.1-alpha-2.jar,\
- lib/commons-cli-1.0.jar,\
- lib/commons-codec-1.3.jar,\
- lib/commons-collections-2.0.jar,\
- lib/commons-httpclient-2.0.2.jar,\
- lib/commons-logging-1.0.2.jar,\
- lib/commons-logging-api-1.0.4.jar,\
- lib/connector-1.0.jar,\
- lib/continuum-api-1.0.3.jar,\
- lib/continuum-core-1.0.3.jar,\
- lib/continuum-model-1.0.3.jar,\
- lib/continuum-notifier-api-1.0.3.jar,\
- lib/continuum-rpc-client-1.0.3.jar,\
- lib/continuum-store-1.0.3.jar,\
- lib/continuum-xmlrpc-1.0.3.jar,\
- lib/doxia-sink-api-1.0-alpha-7.jar,\
- lib/geronimo-spec-jta-1.0.1B-rc2.jar,\
- lib/jdbc-stdext-2.0.jar,\
- lib/jdo2-api-2.0.jar,\
- lib/jpox-1.1.0-20060413.jar,\
- lib/jsch-0.1.24.jar,\
- lib/junit-3.8.1.jar,\
- lib/log4j-1.2.8.jar,\
- lib/maven-artifact-2.0.4.jar,\
- lib/maven-artifact-manager-2.0.4.jar,\
- lib/maven-core-2.0.4.jar,\
- lib/maven-error-diagnostics-2.0.4.jar,\
- lib/maven-model-2.0.4.jar,\
- lib/maven-monitor-2.0.4.jar,\
- lib/maven-plugin-api-2.0.4.jar,\
- lib/maven-plugin-descriptor-2.0.4.jar,\
- lib/maven-plugin-parameter-documenter-2.0.4.jar,\
- lib/maven-plugin-registry-2.0.4.jar,\
- lib/maven-profile-2.0.4.jar,\
- lib/maven-project-2.0.4.jar,\
- lib/maven-reporting-api-2.0.4.jar,\
- lib/maven-repository-metadata-2.0.4.jar,\
- lib/maven-scm-api-1.0-beta-3.jar,\
- lib/maven-scm-manager-plexus-1.0-beta-3.jar,\
- lib/maven-scm-provider-svn-commons-1.0-beta-3.jar,\
- lib/maven-scm-provider-svnexe-1.0-beta-3.jar,\
- lib/maven-settings-2.0.4.jar,\
- lib/ognl-2.6.7.jar,\
- lib/oro-2.0.6.jar,\
- lib/plexus-action-1.0-alpha-6.jar,\
- lib/plexus-command-line-1.0-alpha-2.jar,\
- lib/plexus-container-default-1.0-alpha-9.jar,\
- lib/plexus-formica-1.0-beta-10.jar,\
- lib/plexus-i18n-1.0-beta-6.jar,\
- lib/plexus-interactivity-api-1.0-alpha-4.jar,\
- lib/plexus-jdo2-1.0-alpha-4.jar,\
- lib/plexus-mail-sender-api-1.0-alpha-3.jar,\
- lib/plexus-notification-1.0-alpha-5.jar,\
- lib/plexus-quartz-1.0-alpha-2.jar,\
- lib/plexus-security-api-1.0-alpha-3.jar,\
- lib/plexus-taskqueue-1.0-alpha-3.jar,\
- lib/plexus-utils-1.2.jar,\
- lib/plexus-velocity-1.1.2.jar,\
- lib/quartz-1.4.5.jar,\
- lib/regexp-1.3.jar,\
- lib/velocity-1.4.jar,\
- lib/velocity-dep-1.4.jar,\
- lib/wagon-file-1.0-alpha-7.jar,\
- lib/wagon-http-lightweight-1.0-alpha-6.jar,\
- lib/wagon-provider-api-1.0-alpha-6.jar,\
- lib/wagon-ssh-1.0-alpha-7.jar,\
- lib/wagon-ssh-external-1.0-alpha-6.jar,\
- lib/xmlrpc-2.0.jar
+ plugin.properties
Modified: continuum/sandbox/continuum-eclipse-plugin/src/org/apache/continuum/ui/views/ProjectListViewer.java
URL: http://svn.apache.org/viewvc/continuum/sandbox/continuum-eclipse-plugin/src/org/apache/continuum/ui/views/ProjectListViewer.java?rev=640293&r1=640292&r2=640293&view=diff
==============================================================================
--- continuum/sandbox/continuum-eclipse-plugin/src/org/apache/continuum/ui/views/ProjectListViewer.java (original)
+++ continuum/sandbox/continuum-eclipse-plugin/src/org/apache/continuum/ui/views/ProjectListViewer.java Sun Mar 23 19:33:25 2008
@@ -20,6 +20,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import org.apache.continuum.Activator;
@@ -29,7 +30,8 @@
import org.apache.continuum.model.ConnectionProfile;
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.rpc.ProjectsReader;
+import org.apache.maven.continuum.xmlrpc.client.ContinuumXmlRpcClient;
+import org.apache.maven.continuum.xmlrpc.project.ProjectGroup;
import org.apache.xmlrpc.XmlRpcException;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
@@ -119,6 +121,28 @@
ConnectionProfile cp = (ConnectionProfile) elt;
// Obtain projects for this connection profile
String url = cp.getConnectionUrl ();
+ List<ProjectAdapter> allProjects = new ArrayList<ProjectAdapter>();
+ try {
+ ContinuumXmlRpcClient client = new ContinuumXmlRpcClient(
+ new URL(url));
+ List<ProjectGroup> projectGroups = client
+ .getAllProjectGroupsWithAllDetails();
+ for (Iterator it = projectGroups.iterator(); it.hasNext();) {
+ ProjectGroup pg = (ProjectGroup) it.next();
+ List list = pg.getProjects();
+ for (Iterator it2 = list.iterator(); it2.hasNext();) {
+ Project p = (Project) it2.next();
+ allProjects.add(new ProjectAdapter(p));
+ }
+ }
+ return allProjects.toArray(new ProjectAdapter[allProjects.size()]);
+ } catch (MalformedURLException e) {
+ Activator.getDefault ().getLog ().log (new Status (IStatus.ERROR, Activator.PLUGIN_ID, -1, e.getLocalizedMessage (), e));
+ } catch (Exception e) {
+ Activator.getDefault ().getLog ().log (new Status (IStatus.ERROR, Activator.PLUGIN_ID, -1, e.getLocalizedMessage (), e));
+ }
+
+ /*
try {
ProjectsReader pr = new ProjectsReader (new URL (url));
Project [] projects = pr.readProjects ();
@@ -142,6 +166,7 @@
// TODO: better error reporting.
Activator.getDefault ().getLog ().log (new Status (IStatus.ERROR, Activator.PLUGIN_ID, -1, e.getLocalizedMessage (), e));
}
+ */
}
if (elt instanceof ProjectAdapter) {
@@ -181,14 +206,17 @@
* @return <code>true</code> if a selected node element had children.
*/
public boolean hasChildren(Object elt) {
- if (elt instanceof ConnectionProfile) {
+ if (elt instanceof ConnectionProfile) {
ConnectionProfile cpd = (ConnectionProfile) elt;
try {
// Obtain projects for this connection profile
String url = cpd.getConnectionUrl ();
+ /*
ProjectsReader pr = new ProjectsReader (new URL (url));
Project [] projects = pr.readProjects ();
return (null != projects && projects.length > 0);
+ */
+ return false;
} catch (Exception e) {
MessageDialog.openError (view.getSite ().getShell (), "Error", e.getMessage ());
return false;
Modified: continuum/sandbox/continuum-eclipse-plugin/src/org/apache/continuum/ui/wizard/CreateConnectionProfileWizard.java
URL: http://svn.apache.org/viewvc/continuum/sandbox/continuum-eclipse-plugin/src/org/apache/continuum/ui/wizard/CreateConnectionProfileWizard.java?rev=640293&r1=640292&r2=640293&view=diff
==============================================================================
--- continuum/sandbox/continuum-eclipse-plugin/src/org/apache/continuum/ui/wizard/CreateConnectionProfileWizard.java (original)
+++ continuum/sandbox/continuum-eclipse-plugin/src/org/apache/continuum/ui/wizard/CreateConnectionProfileWizard.java Sun Mar 23 19:33:25 2008
@@ -18,13 +18,17 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Iterator;
import java.util.List;
import org.apache.continuum.Activator;
import org.apache.continuum.internal.ConnectionProfileManager;
+import org.apache.continuum.internal.model.ProjectAdapter;
import org.apache.continuum.model.ConnectionProfile;
import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.rpc.ProjectsReader;
+import org.apache.maven.continuum.xmlrpc.client.ContinuumXmlRpcClient;
+import org.apache.maven.continuum.xmlrpc.project.ProjectGroup;
+import org.apache.maven.continuum.xmlrpc.project.ProjectGroupSummary;
import org.apache.xmlrpc.XmlRpcException;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
@@ -174,20 +178,16 @@
* Server.
*/
private void testConnection() throws CoreException {
- ProjectsReader pr = null;
try {
- pr = new ProjectsReader (new URL (this.connectionProfile.getConnectionUrl ()));
- Project [] projects = null;
- projects = pr.readProjects ();
+ ContinuumXmlRpcClient client = new ContinuumXmlRpcClient(
+ new URL (this.connectionProfile.getConnectionUrl ()));
+ List<ProjectGroupSummary> projectGroups = client
+ .getAllProjectGroups();
} catch (MalformedURLException e) {
- throw new CoreException (new Status (IStatus.ERROR, Activator.PLUGIN_ID, 0, e.getLocalizedMessage (), e));
- } catch (XmlRpcException e) {
- throw new CoreException (new Status (IStatus.ERROR, Activator.PLUGIN_ID, 0, e.getLocalizedMessage (), e));
- } catch (IOException e) {
- throw new CoreException (new Status (IStatus.ERROR, Activator.PLUGIN_ID, 0, e.getLocalizedMessage (), e));
- } finally {
- // cleanup!
- }
+ Activator.getDefault ().getLog ().log (new Status (IStatus.ERROR, Activator.PLUGIN_ID, -1, e.getLocalizedMessage (), e));
+ } catch (Exception e) {
+ Activator.getDefault ().getLog ().log (new Status (IStatus.ERROR, Activator.PLUGIN_ID, -1, e.getLocalizedMessage (), e));
+ }
}
}