Back to hitting no class def found exceptions at runtime.

Author: Layoric

src/ServiceStackEclipse/.classpath

@@ -6,5 +6,6 @@
 	<classpathentry kind="lib" path="libs/maven-core-3.0.5.jar"/>
 	<classpathentry kind="lib" path="libs/maven-model-3.0.5.jar"/>
 	<classpathentry kind="lib" path="libs/plexus-utils-2.0.6.jar"/>
+	<classpathentry kind="lib" path="libs/httpclient-4.3.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

src/ServiceStackEclipse/META-INF/MANIFEST.MF

@@ -10,3 +10,8 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: org.eclipse.core.runtime,
  org.eclipse.jdt.core
+Bundle-ClassPath: .,
+ libs/httpclient-4.3.3.jar,
+ libs/maven-core-3.0.5.jar,
+ libs/maven-model-3.0.5.jar,
+ libs/plexus-utils-2.0.6.jar

src/ServiceStackEclipse/build.properties

@@ -2,4 +2,8 @@ source.. = src/
 output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
-               .
+               .,\
+               libs/httpclient-4.3.3.jar,\
+               libs/maven-core-3.0.5.jar,\
+               libs/maven-model-3.0.5.jar,\
+               libs/plexus-utils-2.0.6.jar

src/ServiceStackEclipse/libs/httpclient-4.3.3.jar

@@ -1,6 +1,6 @@
 package net.servicestack.eclipse.nativetypes;
 
-//import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.client.utils.URIBuilder;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -38,33 +38,32 @@ public String generateUrl(String baseUrl, Map<String, String> options) {
         if (!baseUrl.endsWith("/")) {
             baseUrl += "/";
         }
-    	return null; 
 
-//        URIBuilder builder;
-//        try {
-//            builder = new URIBuilder(baseUrl);
-//        } catch (URISyntaxException e) {
-//            //Log error to IDEA warning bubble/window.
-//            return null;
-//        }
-//
-//        String existingPath = builder.getPath();
-//        if (existingPath == null || existingPath.equals("/")) {
-//            builder.setPath("/types/java");
-//        } else {
-//            builder.setPath(existingPath + "/types/java");
-//        }
-//        if(options != null) {
-//            for (Map.Entry<String, String> item : options.entrySet()) {
-//                builder.addParameter(item.getKey(), item.getValue().trim());
-//            }
-//        }
-//        try {
-//            return builder.build().toString();
-//        } catch (URISyntaxException e) {
-//            e.printStackTrace();
-//            return null;
-//        }
+        URIBuilder builder;
+        try {
+            builder = new URIBuilder(baseUrl);
+        } catch (URISyntaxException e) {
+            //Log error to IDEA warning bubble/window.
+            return null;
+        }
+
+        String existingPath = builder.getPath();
+        if (existingPath == null || existingPath.equals("/")) {
+            builder.setPath("/types/java");
+        } else {
+            builder.setPath(existingPath + "/types/java");
+        }
+        if(options != null) {
+            for (Map.Entry<String, String> item : options.entrySet()) {
+                builder.addParameter(item.getKey(), item.getValue().trim());
+            }
+        }
+        try {
+            return builder.build().toString();
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+            return null;
+        }
     }
 
 

src/ServiceStackEclipse/src/net/servicestack/eclipse/nativetypes/JavaNativeTypesHandler.java

@@ -26,6 +26,8 @@ public class AddReferenceWizard extends Wizard {
 	private boolean _hasPomFile;
 	private File _pomFile;
 
+	private String errorMessage;
+	
     private static final String dependencyGroupId = "net.servicestack";
     private static final String dependencyPackageId = "android";
     private static final String dependencyVersion = "1.0.10";
@@ -65,38 +67,36 @@ public boolean accept(File dir, String name) {
 	@Override
 	public boolean performFinish() {
 		// TODO Auto-generated method stub
+		final String addressUrl = _page.getAddressUrl();
+		final String fileName = _page.getFileName();
 		try {
-			getContainer().run(true, true, new IRunnableWithProgress() {
-			      public void run(IProgressMonitor monitor) throws InterruptedException {
-			         monitor.beginTask("Adding ServiceStack Reference: ", 5);
-			         monitor.worked(1);
-			         monitor.subTask("Validating endpoint...");
+			getShell().getDisplay().asyncExec(new Runnable() {
+			      public void run(){
+			         
 			         INativeTypesHandler nativeTypesHandler = new JavaNativeTypesHandler();
 			         try {
-						boolean validUrl = nativeTypesHandler.validateServiceStackEndpoint(_page.getAddressUrl());
+						boolean validUrl = nativeTypesHandler.validateServiceStackEndpoint(addressUrl);
 		         		if(!validUrl) {
-			         		_page.setErrorMessage("Invalid ServiceStack endpoint.");
+		         			_page.setErrorMessage(errorMessage = "Invalid ServiceStack endpoint.");
 				         }
 					} catch (IOException e1) {
 						// TODO Auto-generated catch block
 						_page.setErrorMessage("Error occurred trying to validate the ServiceStack endpoint - " + e1.getMessage());
 						e1.printStackTrace();
 						return;
 					}
-			         monitor.worked(1);
-			         monitor.subTask("Fetching DTOs...");
+			       
 			         String code = null;
 			         try {
-			        	 code = nativeTypesHandler.getUpdatedCode(_page.getAddressUrl(), null);
+			        	 code = nativeTypesHandler.getUpdatedCode(addressUrl, null);
 					} catch (IOException e1) {
 						// TODO Auto-generated catch block
 						_page.setErrorMessage("Error occurred trying to fetch ServiceStack DTOs - " + e1.getMessage());
 						e1.printStackTrace();
 						return;
 					}
 			         if(_hasPomFile) {
-			        	 monitor.worked(1);
-				         monitor.subTask("Adding Maven dependency...");
+			        	
 			        	 EclipseMavenHelper mavenHelper = new EclipseMavenHelper();
 							try {
 //								if(mavenHelper.addMavenDependencyIfRequired(_pomFile, dependencyGroupId, clientPackageId, dependencyVersion)) {
@@ -107,20 +107,13 @@ public void run(IProgressMonitor monitor) throws InterruptedException {
 								e.printStackTrace();
 							} 
 			         }
-			         
-			         monitor.done();
+			        
 			      }
 			   });
 
 
-		} catch (InvocationTargetException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (InterruptedException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
 		} catch (Exception e) {
-			
+			_page.setErrorMessage("Failed " + e.getMessage());
 		}
 
 		return false;