Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
bin/
target/
pmd-eclipse.log
8 changes: 4 additions & 4 deletions site/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@

<!-- wtp -->

<feature url="features/org.jboss.tools.tomcat.runtimes.integration.feature_0.0.0.jar" id="org.jboss.tools.tomcat.runtimes.integration.feature" version="0.0.0">
<feature url="features/org.jboss.tools.wtp.runtimes.tomcat.feature_0.0.0.jar" id="org.jboss.tools.wtp.runtimes.tomcat.feature" version="0.0.0">
<category name="AllFeatures" />
</feature>
<feature url="features/org.jboss.tools.tomcat.runtimes.integration.tests.feature_0.0.0.jar" id="org.jboss.tools.tomcat.runtimes.integration.tests.feature" version="0.0.0">
<feature url="features/org.jboss.tools.wtp.runtimes.tomcat.tests.feature_0.0.0.jar" id="org.jboss.tools.wtp.runtimes.tomcat.tests.feature" version="0.0.0">
<category name="AllFeatures" />
</feature>
<!-- sources -->
<feature url="features/org.jboss.tools.tomcat.runtimes.integration.feature.source_0.0.0.jar" id="org.jboss.tools.tomcat.runtimes.integration.feature.source" version="0.0.0">
<feature url="features/org.jboss.tools.wtp.runtimes.tomcat.feature.source_0.0.0.jar" id="org.jboss.tools.wtp.runtimes.tomcat.feature.source" version="0.0.0">
<category name="AllSources" />
</feature>
<feature url="features/org.jboss.tools.tomcat.runtimes.integration.tests.feature.source_0.0.0.jar" id="org.jboss.tools.tomcat.runtimes.integration.tests.feature.source" version="0.0.0">
<feature url="features/org.jboss.tools.wtp.runtimes.tomcat.tests.feature.source_0.0.0.jar" id="org.jboss.tools.wtp.runtimes.tomcat.tests.feature.source" version="0.0.0">
<category name="AllSources" />
</feature>

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.jboss.tools.tomcat.runtimes.integration.feature</name>
<name>org.jboss.tools.wtp.runtimes.tomcat.feature</name>
<comment></comment>
<projects>
</projects>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.jboss.tools.tomcat.runtimes.integration.feature"
id="org.jboss.tools.wtp.runtimes.tomcat.feature"
label="%featureName"
version="1.0.0.qualifier"
provider-name="%providerName"
plugin="org.jboss.tools.tomcat.runtimes.integration">
plugin="org.jboss.tools.wtp.runtimes.tomcat">

<description url="http://www.jboss.org/tools">
%description
Expand All @@ -28,7 +28,7 @@ Raleigh NC 27606 USA.
<import feature="org.jboss.tools.runtime.core.feature"/>
</requires>
<plugin
id="org.jboss.tools.tomcat.runtimes.integration"
id="org.jboss.tools.wtp.runtimes.tomcat"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>features</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.jboss.tools.tomcat.runtimes.integration.feature</artifactId>
<artifactId>org.jboss.tools.wtp.runtimes.tomcat.feature</artifactId>
<packaging>eclipse-feature</packaging>

</project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.jboss.tools.tomcat.runtimes.integration.tests.feature</name>
<name>org.jboss.tools.wtp.runtimes.tomcat.tests.feature</name>
<comment></comment>
<projects>
</projects>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.jboss.tools.wtp.runtimes.tomcat.tests.feature" label="%featureName" version="1.0.0.qualifier" provider-name="%providerName">

<description url="%descriptionURL">
%description
</description>

<copyright>
%copyright
</copyright>

<license url="%licenseURL">
%license
</license>

<plugin id="org.jboss.tools.wtp.runtimes.tomcat.tests" download-size="0" install-size="0" version="0.0.0" />

</feature>
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.wtp.features</groupId>
<artifactId>org.jboss.tools.tomcat.runtimes.integration.tests.feature</artifactId>
<artifactId>org.jboss.tools.wtp.runtimes.tomcat.tests.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
4 changes: 2 additions & 2 deletions wtp/features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<name>wtp.features</name>
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.tomcat.runtimes.integration.feature</module>
<module>org.jboss.tools.tomcat.runtimes.integration.tests.feature</module>
<module>org.jboss.tools.wtp.runtimes.tomcat.feature</module>
<module>org.jboss.tools.wtp.runtimes.tomcat.tests.feature</module>
</modules>
<build>
<plugins>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.jboss.tools.tomcat.runtimes.integration</name>
<name>org.jboss.tools.wtp.runtimes.tomcat</name>
<comment></comment>
<projects>
</projects>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %BundleName
Bundle-SymbolicName: org.jboss.tools.tomcat.runtimes.integration;singleton:=true
Bundle-SymbolicName: org.jboss.tools.wtp.runtimes.tomcat;singleton:=true
Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.jboss.tools.runtime.core,
Expand All @@ -14,5 +14,5 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %BundleVendor
Bundle-Localization: plugin
Export-Package: org.jboss.tools.runtime.tomcat.internal.detection;x-friends:="org.jboss.tools.tomcat.runtimes.integration.tests"
Export-Package: org.jboss.tools.wtp.runtimes.tomcat.internal.detection;x-friends:="org.jboss.tools.wtp.runtimes.tomcat.tests"

Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<extension
point="org.jboss.tools.runtime.core.runtimeDetectors">
<runtimeDetector
id="org.jboss.tools.runtime.detection.TomcatRuntimeDetector"
id="org.jboss.tools.wtp.runtimes.tomcat.TomcatRuntimeDetector"
name="Tomcat"
class="org.jboss.tools.runtime.tomcat.internal.detection.TomcatRuntimeDetectorDelegate"
class="org.jboss.tools.wtp.runtimes.tomcat.internal.detection.TomcatRuntimeDetectorDelegate"
preferenceId="org.eclipse.wst.server.ui.runtime.preferencePage"
priority="200"/>
</extension>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.as.plugins</groupId>
<artifactId>org.jboss.tools.tomcat.runtimes.integration</artifactId>
<artifactId>org.jboss.tools.wtp.runtimes.tomcat</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Red Hat, Inc. - initial API and implementation
******************************************************************************/

package org.jboss.tools.runtime.tomcat.internal.detection;
package org.jboss.tools.wtp.runtimes.tomcat.internal.detection;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Plugin;
Expand All @@ -22,7 +22,7 @@
public class RuntimeTomcatActivator extends Plugin {

// The plug-in ID
public static final String PLUGIN_ID = "org.jboss.tools.tomcat.runtimes.integration"; //$NON-NLS-1$
public static final String PLUGIN_ID = "org.jboss.tools.wtp.runtimes.tomcat"; //$NON-NLS-1$

// The shared instance
private static RuntimeTomcatActivator plugin;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Contributors:
* JBoss by Red Hat - Initial implementation.
************************************************************************************/
package org.jboss.tools.runtime.tomcat.internal.detection;
package org.jboss.tools.wtp.runtimes.tomcat.internal.detection;

import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerCore;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Contributors:
* JBoss by Red Hat - Initial implementation.
************************************************************************************/
package org.jboss.tools.runtime.tomcat.internal.detection;
package org.jboss.tools.wtp.runtimes.tomcat.internal.detection;

import java.io.File;
import java.io.IOException;
Expand Down
2 changes: 1 addition & 1 deletion wtp/plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<name>wtp.plugins</name>
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.tomcat.runtimes.integration</module>
<module>org.jboss.tools.wtp.runtimes.tomcat</module>
</modules>
</project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.jboss.tools.tomcat.runtimes.integration.tests</name>
<name>org.jboss.tools.wtp.runtimes.tomcat.tests</name>
<comment></comment>
<projects>
</projects>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %BundleName
Bundle-SymbolicName: org.jboss.tools.tomcat.runtimes.integration.tests;singleton:=true
Bundle-SymbolicName: org.jboss.tools.wtp.runtimes.tomcat.tests;singleton:=true
Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.junit;bundle-version="4.11.0",
Expand All @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.jboss.tools.tests,
org.eclipse.ui,
org.eclipse.core.resources,
org.jboss.tools.tomcat.runtimes.integration;bundle-version="1.0.0",
org.jboss.tools.wtp.runtimes.tomcat;bundle-version="1.0.0",
org.eclipse.jst.server.core;bundle-version="1.2.0",
org.eclipse.wst.server.core;bundle-version="1.5.0"
Bundle-ActivationPolicy: lazy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.wtp.tests</groupId>
<artifactId>org.jboss.tools.tomcat.runtimes.integration.tests</artifactId>
<artifactId>org.jboss.tools.wtp.runtimes.tomcat.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Contributors:
* JBoss by Red Hat - Initial implementation.
************************************************************************************/
package org.jboss.tools.tomcat.runtimes.integration.tests;
package org.jboss.tools.wtp.runtimes.tomcat.tests;

import static org.junit.Assert.assertTrue;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@
* Contributors:
* JBoss by Red Hat - Initial implementation.
************************************************************************************/
package org.jboss.tools.tomcat.runtimes.integration.tests;
package org.jboss.tools.wtp.runtimes.tomcat.tests;

import static org.junit.Assert.assertEquals;

import java.io.File;

import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.tools.runtime.core.util.RuntimeInitializerUtil;
import org.jboss.tools.runtime.tomcat.internal.detection.ServerUtils;
import org.jboss.tools.wtp.runtimes.tomcat.internal.detection.ServerUtils;
import org.junit.Test;


Expand All @@ -25,6 +26,7 @@ public class ServerUtilTest extends AbstractTomcatDetectionTest {
@Test
public void testUniqueServerName() {
RuntimeInitializerUtil.initializeRuntimesFromFolder(new File(REQUIREMENTS_DIR), new NullProgressMonitor());
assertEquals("No servers were detected in the requirement directory", 2, ServerCore.getServers().length);
assertEquals("foo", ServerUtils.getUniqueServerName("foo"));
assertEquals(TOMCAT_7+ " (2)", ServerUtils.getUniqueServerName(TOMCAT_7));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Contributors:
* JBoss by Red Hat - Initial implementation.
************************************************************************************/
package org.jboss.tools.tomcat.runtimes.integration.tests;
package org.jboss.tools.wtp.runtimes.tomcat.tests;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
Expand Down Expand Up @@ -39,7 +39,7 @@ public class TomcatDetectionTest extends AbstractTomcatDetectionTest {
@Before
public void setUp() throws CoreException {
super.setUp();
tomcatDetector = RuntimeCoreActivator.getDefault().findRuntimeDetector("org.jboss.tools.runtime.detection.TomcatRuntimeDetector");
tomcatDetector = RuntimeCoreActivator.getDefault().findRuntimeDetector("org.jboss.tools.wtp.runtimes.tomcat.TomcatRuntimeDetector");
assertNotNull("Tomcat detected not found", tomcatDetector);
}
@After
Expand Down
2 changes: 1 addition & 1 deletion wtp/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<name>wtp.tests</name>
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.tomcat.runtimes.integration.tests</module>
<module>org.jboss.tools.wtp.runtimes.tomcat.tests</module>
</modules>
<build>

Expand Down