[jbosstools-commits] JBoss Tools SVN: r44370 - in trunk/maven/plugins/org.jboss.tools.maven.project.examples: .settings and 4 other directories.

Author: fbricon Date: 2012-10-09 04:15:52 -0400 (Tue, 09 Oct 2012) New Revision: 44370 Added: trunk/maven/plugins/org.jboss.tools.maven.project.examples/.settings/org.eclipse.m2e.core.prefs trunk/maven/plugins/org.jboss.tools.maven.project.examples/lib/stacks-client-1.0.0.Final.jar Removed: trunk/maven/plugins/org.jboss.tools.maven.project.examples/lib/stacks-client-1.0.0.CR2.jar Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/.classpath trunk/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.project.examples/build.properties trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/stacks/StacksManager.java trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/stacks/StacksUtil.java trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/xpl/MavenProjectWizardArchetypeParametersPage.java Log: JBIDE-12816 Upgrade stacks client to 1.0.0.Final Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/.classpath =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/.classpath 2012-10-09 03:47:29 UTC (rev 44369) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/.classpath 2012-10-09 08:15:52 UTC (rev 44370) @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry exported="true" kind="lib" path="lib/stacks-client-1.0.0.Final.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.3.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/httpclient-4.0.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/httpcore-4.0.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.1.2.GA.jar"/> <classpathentry exported="true" kind="lib" path="lib/snakeyaml-1.10.jar"/> - <classpathentry exported="true" kind="lib" path="lib/stacks-client-1.0.0.CR2.jar"/> <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"/> Added: trunk/maven/plugins/org.jboss.tools.maven.project.examples/.settings/org.eclipse.m2e.core.prefs =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/.settings/org.eclipse.m2e.core.prefs (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/.settings/org.eclipse.m2e.core.prefs 2012-10-09 08:15:52 UTC (rev 44370) @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF 2012-10-09 03:47:29 UTC (rev 44369) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF 2012-10-09 08:15:52 UTC (rev 44370) @@ -23,7 +23,7 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor -Bundle-ClassPath: lib/stacks-client-1.0.0.CR2.jar, +Bundle-ClassPath: lib/stacks-client-1.0.0.Final.jar, lib/commons-codec-1.3.jar, lib/commons-logging-1.1.1.jar, lib/httpclient-4.0.1.jar, Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/build.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/build.properties 2012-10-09 03:47:29 UTC (rev 44369) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/build.properties 2012-10-09 08:15:52 UTC (rev 44370) @@ -16,5 +16,5 @@ lib/httpcore-4.0.1.jar,\ lib/jboss-logging-3.1.2.GA.jar,\ lib/snakeyaml-1.10.jar,\ - lib/stacks-client-1.0.0.CR2.jar + lib/stacks-client-1.0.0.Final.jar src.includes = src/ Deleted: trunk/maven/plugins/org.jboss.tools.maven.project.examples/lib/stacks-client-1.0.0.CR2.jar =================================================================== (Binary files differ) Added: trunk/maven/plugins/org.jboss.tools.maven.project.examples/lib/stacks-client-1.0.0.Final.jar =================================================================== (Binary files differ) Property changes on: trunk/maven/plugins/org.jboss.tools.maven.project.examples/lib/stacks-client-1.0.0.Final.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/stacks/StacksManager.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/stacks/StacksManager.java 2012-10-09 03:47:29 UTC (rev 44369) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/stacks/StacksManager.java 2012-10-09 08:15:52 UTC (rev 44370) @@ -66,12 +66,12 @@ private static String getStacksUrlFromJar() { InputStream is = null; try { - is = StacksManager.class.getResourceAsStream("/org/jboss/jdf/stacks/client/config.properties"); + is = StacksManager.class.getResourceAsStream("/org/jboss/jdf/stacks/client/config.properties"); //$NON-NLS-1$ Properties p = new Properties(); p.load(is); return p.getProperty(StacksClientConfiguration.REPO_PROPERTY); } catch (Exception e) { - System.err.println("Can't read stacks url from the stacks-client.jar"); + System.err.println("Can't read stacks url from the stacks-client.jar"); //$NON-NLS-1$ e.printStackTrace(); } finally { IOUtil.close(is); Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/stacks/StacksUtil.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/stacks/StacksUtil.java 2012-10-09 03:47:29 UTC (rev 44369) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/stacks/StacksUtil.java 2012-10-09 08:15:52 UTC (rev 44370) @@ -32,18 +32,18 @@ Map<String, String> serverIdMap = new HashMap<String, String>(); - serverIdMap.put("org.jboss.ide.eclipse.as.runtime.eap.60","jbosseap6runtime"); - serverIdMap.put("org.jboss.ide.eclipse.as.runtime.71","jboss-as711runtime"); + serverIdMap.put("org.jboss.ide.eclipse.as.runtime.eap.60","jbosseap6runtime"); //$NON-NLS-1$ //$NON-NLS-2$ + serverIdMap.put("org.jboss.ide.eclipse.as.runtime.71","jboss-as711runtime"); //$NON-NLS-1$ //$NON-NLS-2$ //serverIdMap.put("org.jboss.ide.eclipse.as.runtime.71","jboss-as710runtime"); - serverIdMap.put("org.jboss.ide.eclipse.as.runtime.70","jboss-as702runtime-web"); + serverIdMap.put("org.jboss.ide.eclipse.as.runtime.70","jboss-as702runtime-web"); //$NON-NLS-1$ //$NON-NLS-2$ //serverIdMap.put("org.jboss.ide.eclipse.as.runtime.70","jboss-as702runtime-full"); RUNTIMES_MAP = Collections.unmodifiableMap(serverIdMap); } - public static final String EAP_TYPE = "EAP"; + public static final String EAP_TYPE = "EAP"; //$NON-NLS-1$ - public static final String AS_TYPE = "AS"; + public static final String AS_TYPE = "AS"; //$NON-NLS-1$ private StacksUtil() { // no need for public constructor @@ -122,7 +122,7 @@ } for (Runtime runtime : fromStacks.getAvailableRuntimes()) { Properties p = runtime.getLabels(); - if (p != null && wtpRuntimeId.equals(p.get("wtp-runtime-id"))) { + if (p != null && wtpRuntimeId.equals(p.get("wtp-runtime-id"))) { //$NON-NLS-1$ return runtime; } } @@ -140,7 +140,7 @@ } for (Runtime runtime : fromStacks.getAvailableRuntimes()) { Properties p = runtime.getLabels(); - if (p != null && wtpRuntimeId.equals(p.get("wtp-runtime-id"))) { + if (p != null && wtpRuntimeId.equals(p.get("wtp-runtime-id"))) { //$NON-NLS-1$ return runtime; } } @@ -203,7 +203,7 @@ } Properties p = runtime.getLabels(); - return (String)p.get("runtime-type"); + return (String)p.get("runtime-type"); //$NON-NLS-1$ } public static ArchetypeModel createArchetypeModel(ArchetypeModel archetypeModel, ArchetypeVersion archetypeVersion) throws CloneNotSupportedException { @@ -211,6 +211,7 @@ a.setArchetypeArtifactId(archetypeVersion.getArchetype().getArtifactId()); a.setArchetypeGroupId(archetypeVersion.getArchetype().getGroupId()); a.setArchetypeVersion(archetypeVersion.getVersion()); + a.setArchetypeRepository(archetypeVersion.getRepositoryURL()); return a; } Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/xpl/MavenProjectWizardArchetypeParametersPage.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/xpl/MavenProjectWizardArchetypeParametersPage.java 2012-10-09 03:47:29 UTC (rev 44369) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/xpl/MavenProjectWizardArchetypeParametersPage.java 2012-10-09 08:15:52 UTC (rev 44370) @@ -624,7 +624,7 @@ */ public static ArtifactRepository getArchetypeRepository(Archetype archetype) throws CoreException { String repoUrl = archetype.getRepository(); - if (repoUrl == null) { + if (repoUrl == null || repoUrl.trim().length() == 0) { RemoteCatalogFactory catalogFactory = MavenPluginActivator.getDefault().getArchetypeManager().findParentCatalogFactory(archetype, RemoteCatalogFactory.class); if (catalogFactory != null ) { repoUrl = catalogFactory.getRepositoryUrl();