JBoss Tools SVN: r30674 - in trunk/as/org.jboss.ide.eclipse.as.management.as7.tests: .settings and 14 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-20 09:13:41 -0400 (Wed, 20 Apr 2011)
New Revision: 30674
Added:
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/.classpath
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/.project
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/.settings/
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/.settings/org.eclipse.jdt.core.prefs
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/build.properties
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/Activator.java
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DeployerTestUtils.java
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DeploymentManagerIntegratonTest.java
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DetypedDeployerIntegrationTest.java
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/TypedDeployerIntegrationTest.java
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/gwt-helloworld.war
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic.war
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/META-INF/
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/META-INF/MANIFEST.MF
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/WEB-INF/
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/WEB-INF/classes/
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/WEB-INF/lib/
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/WEB-INF/web.xml
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/index.html
Log:
[JBIDE-8690] moved from workspace to trunk, added tests
Added: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/.classpath
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/.classpath (rev 0)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/.classpath 2011-04-20 13:13:41 UTC (rev 30674)
@@ -0,0 +1,8 @@
+<?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="src" path="wars"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/.project
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/.project (rev 0)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/.project 2011-04-20 13:13:41 UTC (rev 30674)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.ide.eclipse.as.management.as7.tests</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: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/.settings/org.eclipse.jdt.core.prefs 2011-04-20 13:13:41 UTC (rev 30674)
@@ -0,0 +1,8 @@
+#Thu Apr 07 10:43:42 CEST 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: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF (rev 0)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF 2011-04-20 13:13:41 UTC (rev 30674)
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests
+Bundle-SymbolicName: org.jboss.ide.eclipse.as.management.as7.tests
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.jboss.ide.eclipse.as.management.as7;bundle-version="1.0.0",
+ org.junit;bundle-version="[4.8.1,5.0.0)",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.hamcrest;bundle-version="1.1.0"
+Bundle-ClassPath: .,
+ wars/
Property changes on: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/build.properties
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/build.properties (rev 0)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/build.properties 2011-04-20 13:13:41 UTC (rev 30674)
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ wars/
Property changes on: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/build.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/Activator.java
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/Activator.java (rev 0)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/Activator.java 2011-04-20 13:13:41 UTC (rev 30674)
@@ -0,0 +1,30 @@
+package org.jboss.ide.eclipse.as.management.as7.tests;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+
+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;
+ }
+}
Property changes on: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/Activator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DeployerTestUtils.java
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DeployerTestUtils.java (rev 0)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DeployerTestUtils.java 2011-04-20 13:13:41 UTC (rev 30674)
@@ -0,0 +1,86 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ide.eclipse.as.management.as7.tests;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.net.HttpURLConnection;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.text.MessageFormat;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
+import org.osgi.framework.Bundle;
+
+/**
+ * @author André Dietisheim
+ */
+public class DeployerTestUtils {
+
+ public static final String GWT_HELLOWORLD_WAR = "gwt-helloworld.war";
+ public static final String MINIMALISTIC_WAR = "minimalistic.war";
+
+ public static final String HOST = "localhost";
+ public static final int MGMT_PORT = 9999;
+ public static final int WEB_PORT = 8080;
+
+ private static final String WAR_FOLDER = "/wars/";
+ private static final String BUNDLE_ID = "org.jboss.ide.eclipse.as.management.as7.tests";
+
+ private static final int WEBAPP_RESPONSE_TIMEOUT = 10 * 1024;
+
+ public static File getWarFile(String name) throws URISyntaxException, IOException {
+ Bundle bundle = Platform.getBundle(BUNDLE_ID);
+ URL entryUrl = bundle.getEntry(WAR_FOLDER + name);
+ return new File(FileLocator.resolve(entryUrl).toURI());
+ }
+
+ public static String getWebappResponse(String name, String host, int port) throws IOException {
+ return getServerResponse(new URL(
+ MessageFormat.format(
+ "http://{0}:{1}/{2}", host, String.valueOf(port), name)));
+ }
+
+ public static String getServerResponse(URL url) throws IOException {
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setUseCaches(false);
+ connection.setDoInput(true);
+ connection.setAllowUserInteraction(false);
+ connection.setConnectTimeout(WEBAPP_RESPONSE_TIMEOUT);
+ connection.setInstanceFollowRedirects(true);
+ connection.setDoOutput(false);
+ BufferedInputStream in = new BufferedInputStream(connection.getInputStream());
+ return toString(in);
+ }
+
+ public static String toString(InputStream in) throws IOException {
+ StringWriter writer = new StringWriter();
+ for (int data = -1; ((data = in.read()) != -1);) {
+ writer.write(data);
+ }
+ return writer.toString();
+ }
+}
Property changes on: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DeployerTestUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DeploymentManagerIntegratonTest.java
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DeploymentManagerIntegratonTest.java (rev 0)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DeploymentManagerIntegratonTest.java 2011-04-20 13:13:41 UTC (rev 30674)
@@ -0,0 +1,126 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ide.eclipse.as.management.as7.tests;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.net.HttpURLConnection;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.text.MessageFormat;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
+import org.jboss.ide.eclipse.as.management.as7.deployment.DeployerException;
+import org.jboss.ide.eclipse.as.management.as7.deployment.DeploymentManager;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+
+/**
+ *
+ * @author André Dietisheim
+ */
+public class DeploymentManagerIntegratonTest {
+
+ private static final String WAR_FOLDER = "/wars/";
+ private static final String BUNDLE_ID = "org.jboss.ide.eclipse.as7.deployment.tests";
+
+ private static final int WEBAPP_RESPONSE_TIMEOUT = 10 * 1024;
+
+ private static final String HOST = "localhost";
+ private static final int MGMT_PORT = 9999;
+ private static final int WEB_PORT = 8080;
+
+ @Test
+ public void canDeploy() throws Exception {
+ DeploymentManager deployer = null;
+ File warFile = getWarFile("minimalistic.war");
+ try {
+ deployer = new DeploymentManager(HOST, MGMT_PORT);
+ deployer.deploy(warFile).execute();
+
+ String response = getServerResponse(new URL(
+ MessageFormat.format(
+ "http://{0}:{1}/{2}", HOST, String.valueOf(WEB_PORT), "minimalistic")));
+ assertTrue(response.indexOf("minimalistic") >= 0);
+
+ } finally {
+ quietlyUndeploy(warFile, deployer);
+ }
+ }
+
+ @Test(expected = DeployerException.class)
+ public void cannotDeployWarTwice() throws Exception {
+ DeploymentManager deployer = null;
+ File warFile = getWarFile("minimalistic.war");
+ try {
+ deployer = new DeploymentManager(HOST, MGMT_PORT);
+ deployer.deploy(warFile).execute();
+ deployer.deploy(warFile).execute();
+ } finally {
+ quietlyUndeploy(warFile, deployer);
+ }
+ }
+
+ private File getWarFile(String name) throws URISyntaxException, IOException {
+ Bundle bundle = Platform.getBundle(BUNDLE_ID);
+ URL entryUrl = bundle.getEntry(WAR_FOLDER + name);
+ return new File(FileLocator.resolve(entryUrl).toURI());
+ }
+
+ private String getServerResponse(URL url) throws IOException {
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setUseCaches(false);
+ connection.setDoInput(true);
+ connection.setAllowUserInteraction(false);
+ connection.setConnectTimeout(WEBAPP_RESPONSE_TIMEOUT);
+ connection.setInstanceFollowRedirects(true);
+ connection.setDoOutput(false);
+ BufferedInputStream in = new BufferedInputStream(connection.getInputStream());
+ return toString(in);
+ }
+
+ private String toString(InputStream in) throws IOException {
+ StringWriter writer = new StringWriter();
+ for (int data = -1; ((data = in.read()) != -1);) {
+ writer.write(data);
+ }
+ return writer.toString();
+ }
+
+ private void quietlyUndeploy(File file, DeploymentManager deployer) {
+ try {
+ if (deployer != null) {
+ deployer.undeploy(file).execute();
+ deployer.dispose();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ // ignore
+ }
+ }
+}
Property changes on: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DeploymentManagerIntegratonTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DetypedDeployerIntegrationTest.java
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DetypedDeployerIntegrationTest.java (rev 0)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DetypedDeployerIntegrationTest.java 2011-04-20 13:13:41 UTC (rev 30674)
@@ -0,0 +1,111 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ide.eclipse.as.management.as7.tests;
+
+import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.management.as7.deployment.DeployerException;
+import org.jboss.ide.eclipse.as.management.as7.deployment.DetypedDeployer;
+import org.junit.Test;
+
+/**
+ * @author André Dietisheim
+ */
+public class DetypedDeployerIntegrationTest {
+
+ @Test
+ public void canDeploy() throws Exception {
+ File warFile = DeployerTestUtils.getWarFile(DeployerTestUtils.MINIMALISTIC_WAR);
+ try {
+ DetypedDeployer.deploy(warFile, DeployerTestUtils.HOST, DeployerTestUtils.MGMT_PORT);
+
+ String response = DeployerTestUtils.getWebappResponse("minimalistic", DeployerTestUtils.HOST, DeployerTestUtils.WEB_PORT);
+ assertTrue(response.indexOf("minimalistic") >= 0);
+
+ } finally {
+ quietlyUndeploy(warFile);
+ }
+ }
+
+ @Test(expected = DeployerException.class)
+ public void cannotDeployWarTwice() throws Exception {
+ File warFile = DeployerTestUtils.getWarFile(DeployerTestUtils.MINIMALISTIC_WAR);
+ try {
+ DetypedDeployer.deploy(warFile, DeployerTestUtils.HOST, DeployerTestUtils.MGMT_PORT);
+ DetypedDeployer.deploy(warFile, DeployerTestUtils.HOST, DeployerTestUtils.MGMT_PORT);
+ } finally {
+ quietlyUndeploy(warFile);
+ }
+ }
+
+ @Test
+ public void canReplaceWar() throws Exception {
+ File warFile = DeployerTestUtils.getWarFile(DeployerTestUtils.MINIMALISTIC_WAR);
+ File warFile2 = DeployerTestUtils.getWarFile(DeployerTestUtils.GWT_HELLOWORLD_WAR);
+ String name = warFile.getName();
+ try {
+ DetypedDeployer.deploy(name, warFile, DeployerTestUtils.HOST, DeployerTestUtils.MGMT_PORT);
+ DetypedDeployer.replace(name, warFile2, DeployerTestUtils.HOST, DeployerTestUtils.MGMT_PORT);
+ String response = DeployerTestUtils.getWebappResponse(
+ "minimalistic", DeployerTestUtils.HOST, DeployerTestUtils.WEB_PORT);
+ assertTrue(response.indexOf("GWT") >= 0);
+ } finally {
+ quietlyUndeploy(warFile);
+ }
+ }
+
+ @Test(expected = DeployerException.class)
+ public void cannotUndeployNondeployed() throws DeployerException {
+ DetypedDeployer.undeploy("inexistant", DeployerTestUtils.HOST, DeployerTestUtils.MGMT_PORT);
+ }
+
+ @Test
+ public void canQueryDeploymentdeployedState() throws Exception {
+ File warFile = DeployerTestUtils.getWarFile(DeployerTestUtils.MINIMALISTIC_WAR);
+ File warFile2 = DeployerTestUtils.getWarFile(DeployerTestUtils.GWT_HELLOWORLD_WAR);
+ try {
+ DetypedDeployer.deploy(warFile, DeployerTestUtils.HOST, DeployerTestUtils.MGMT_PORT);
+ DetypedDeployer.deploy(warFile2, DeployerTestUtils.HOST, DeployerTestUtils.MGMT_PORT);
+ List<String> deployments = DetypedDeployer.getDeployments(DeployerTestUtils.HOST, DeployerTestUtils.MGMT_PORT);
+ assertThat(deployments.size(), is(2));
+ assertThat(deployments, hasItems(DeployerTestUtils.MINIMALISTIC_WAR, DeployerTestUtils.GWT_HELLOWORLD_WAR));
+ } finally {
+ quietlyUndeploy(warFile);
+ quietlyUndeploy(warFile2);
+ }
+ }
+
+ private void quietlyUndeploy(File file) {
+ try {
+ DetypedDeployer.undeploy(file.getName(), DeployerTestUtils.HOST, DeployerTestUtils.MGMT_PORT);
+ } catch (Exception e) {
+ e.printStackTrace();
+ // ignore
+ }
+ }
+}
Property changes on: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DetypedDeployerIntegrationTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/TypedDeployerIntegrationTest.java
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/TypedDeployerIntegrationTest.java (rev 0)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/TypedDeployerIntegrationTest.java 2011-04-20 13:13:41 UTC (rev 30674)
@@ -0,0 +1,129 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ide.eclipse.as.management.as7.tests;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.net.UnknownHostException;
+import java.util.concurrent.ExecutionException;
+
+import org.jboss.ide.eclipse.as.management.as7.deployment.DeployerException;
+import org.jboss.ide.eclipse.as.management.as7.deployment.TypedDeployer;
+import org.jboss.ide.eclipse.as.management.as7.deployment.TypedDeployer.DeploymentResult;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ *
+ * @author André Dietisheim
+ */
+public class TypedDeployerIntegrationTest {
+
+ private TypedDeployer deployer;
+
+ @Before
+ public void setUp() throws UnknownHostException {
+ this.deployer = new TypedDeployer(DeployerTestUtils.HOST, DeployerTestUtils.MGMT_PORT);
+ }
+
+ @After
+ public void tearDown() {
+ deployer.dispose();
+ }
+
+ @Test
+ public void canDeploy() throws Exception {
+ File warFile = DeployerTestUtils.getWarFile(DeployerTestUtils.MINIMALISTIC_WAR);
+ try {
+ waitUntilFinished(deployer.deploy(warFile));
+
+ String response = DeployerTestUtils.getWebappResponse(
+ "minimalistic", DeployerTestUtils.HOST, DeployerTestUtils.WEB_PORT);
+ assertTrue(response.indexOf("minimalistic") >= 0);
+
+ } finally {
+ quietlyUndeploy(warFile);
+ }
+ }
+
+ @Test
+ public void deployedWarHasDeployedStatus() throws Exception {
+ File warFile = DeployerTestUtils.getWarFile(DeployerTestUtils.MINIMALISTIC_WAR);
+ try {
+ waitUntilFinished(deployer.deploy(warFile));
+
+ String response = DeployerTestUtils.getWebappResponse(
+ "minimalistic", DeployerTestUtils.HOST, DeployerTestUtils.WEB_PORT);
+ assertTrue(response.indexOf("minimalistic") >= 0);
+
+ } finally {
+ quietlyUndeploy(warFile);
+ }
+ }
+
+ @Test(expected = DeployerException.class)
+ public void cannotDeployWarTwice() throws Exception {
+ File warFile = DeployerTestUtils.getWarFile(DeployerTestUtils.MINIMALISTIC_WAR);
+ try {
+ waitUntilFinished(deployer.deploy(warFile));
+ waitUntilFinished(deployer.deploy(warFile));
+ } finally {
+ quietlyUndeploy(warFile);
+ }
+ }
+
+ @Test(expected = DeployerException.class)
+ public void cannotUndeployNondeployed() throws DeployerException, InterruptedException, ExecutionException {
+ waitUntilFinished(deployer.undeploy("inexistant"));
+ }
+
+ @Test
+ public void canReplaceWar() throws Exception {
+ File warFile = DeployerTestUtils.getWarFile(DeployerTestUtils.MINIMALISTIC_WAR);
+ File warFile2 = DeployerTestUtils.getWarFile(DeployerTestUtils.GWT_HELLOWORLD_WAR);
+ String name = warFile.getName();
+ try {
+ waitUntilFinished(deployer.deploy(name, warFile));
+ waitUntilFinished(deployer.replace(name, warFile2));
+ String response = DeployerTestUtils.getWebappResponse(
+ "minimalistic", DeployerTestUtils.HOST, DeployerTestUtils.WEB_PORT);
+ assertTrue(response.indexOf("GWT") >= 0);
+ } finally {
+ quietlyUndeploy(warFile);
+ }
+ }
+
+ private void quietlyUndeploy(File file) {
+ try {
+ waitUntilFinished(deployer.undeploy(file.getName()));
+ } catch (Exception e) {
+ e.printStackTrace();
+ // ignore
+ }
+ }
+
+ private void waitUntilFinished(DeploymentResult result) throws DeployerException {
+ result.getStatus(); // wait for operation to finish
+ }
+}
Property changes on: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/TypedDeployerIntegrationTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/gwt-helloworld.war
===================================================================
(Binary files differ)
Property changes on: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/gwt-helloworld.war
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/META-INF/MANIFEST.MF (rev 0)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/META-INF/MANIFEST.MF 2011-04-20 13:13:41 UTC (rev 30674)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/WEB-INF/web.xml
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/WEB-INF/web.xml (rev 0)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/WEB-INF/web.xml 2011-04-20 13:13:41 UTC (rev 30674)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
+ <display-name>minimalistic</display-name>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
\ No newline at end of file
Property changes on: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/WEB-INF/web.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/index.html
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/index.html (rev 0)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/index.html 2011-04-20 13:13:41 UTC (rev 30674)
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>minimalistic</title>
+</head>
+<body>
+this is really minimalistic
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic/index.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic.war
===================================================================
(Binary files differ)
Property changes on: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/wars/minimalistic.war
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30673 - trunk/as.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-20 09:12:05 -0400 (Wed, 20 Apr 2011)
New Revision: 30673
Added:
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/
Log:
[JBIDE-8690] moved from workspace to trunk, added tests
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30672 - trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb.
by jbosstools-commits＠lists.jboss.org
Author: jlukas(a)redhat.com
Date: 2011-04-20 08:28:03 -0400 (Wed, 20 Apr 2011)
New Revision: 30672
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml
Log:
typo
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml 2011-04-20 11:58:52 UTC (rev 30671)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml 2011-04-20 12:28:03 UTC (rev 30672)
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
<soap:Body>
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30671 - in trunk/ws/tests/org.jboss.tools.ws.ui.test/resources: jbds1602 and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jlukas(a)redhat.com
Date: 2011-04-20 07:58:52 -0400 (Wed, 20 Apr 2011)
New Revision: 30671
Added:
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/ConverterPortType.wsdl
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/StockQuoteService.wsdl
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.wsdl
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_1.xsd
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_2.xsd
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_3.xsd
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_4.xsd
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_5.xsd
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_6.xsd
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_7.xsd
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_8.xsd
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/msg_in.xml
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml
Log:
JBDS-1602 - test files
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/ConverterPortType.wsdl
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/ConverterPortType.wsdl (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/ConverterPortType.wsdl 2011-04-20 11:58:52 UTC (rev 30671)
@@ -0,0 +1,57 @@
+<definitions name="Converter" targetNamespace="http://test.jboss.org/ns" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://test.jboss.org/ns" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <types>
+ <xs:schema elementFormDefault="qualified" targetNamespace="http://test.jboss.org/ns" version="1.0" xmlns:tns="http://test.jboss.org/ns" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="ChangeUnit">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="value" type="xs:double"/>
+ <xs:element name="fromUnit" type="tns:Units"/>
+ <xs:element name="toUnit" type="tns:Units"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ChangeUnitResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="ChangeUnitResult" type="xs:double"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:simpleType name="Units">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="kilometer"/>
+ <xs:enumeration value="meter"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:schema>
+ </types>
+ <message name="ConverterPortType_convertResponse">
+ <part element="tns:ChangeUnitResponse" name="parameters"/>
+ </message>
+ <message name="ConverterPortType_convert">
+ <part element="tns:ChangeUnit" name="parameters"/>
+ </message>
+ <portType name="ConverterPortType">
+ <operation name="convert" parameterOrder="parameters">
+ <input message="tns:ConverterPortType_convert"/>
+ <output message="tns:ConverterPortType_convertResponse"/>
+ </operation>
+ </portType>
+ <binding name="ConverterPortTypeBinding" type="tns:ConverterPortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="convert">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="Converter">
+ <port binding="tns:ConverterPortTypeBinding" name="ConverterPortTypeImplPort">
+ <soap:address location="http://localhost:8080/SimpleWSWAR/ConverterPortType"/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/StockQuoteService.wsdl
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/StockQuoteService.wsdl (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/StockQuoteService.wsdl 2011-04-20 11:58:52 UTC (rev 30671)
@@ -0,0 +1,47 @@
+<definitions name="StockQuoteService" targetNamespace="http://www.jboss.com/webservices/StockQuoteService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.jboss.com/webservices/StockQuoteService" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <types>
+ <xs:schema targetNamespace="http://www.jboss.com/webservices/StockQuoteService" version="1.0" xmlns:tns="http://www.jboss.com/webservices/StockQuoteService" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="getStockQuoteBySymbol" type="tns:getStockQuoteBySymbol"/>
+ <xs:element name="getStockQuoteBySymbolResponse" type="tns:getStockQuoteBySymbolResponse"/>
+ <xs:complexType name="getStockQuoteBySymbol">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="arg0" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="getStockQuoteBySymbolResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:float"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name="StockQuoteService_getStockQuoteBySymbol">
+ <part element="tns:getStockQuoteBySymbol" name="getStockQuoteBySymbol"/>
+ </message>
+ <message name="StockQuoteService_getStockQuoteBySymbolResponse">
+ <part element="tns:getStockQuoteBySymbolResponse" name="getStockQuoteBySymbolResponse"/>
+ </message>
+ <portType name="StockQuoteService">
+ <operation name="getStockQuoteBySymbol" parameterOrder="getStockQuoteBySymbol">
+ <input message="tns:StockQuoteService_getStockQuoteBySymbol"/>
+ <output message="tns:StockQuoteService_getStockQuoteBySymbolResponse"/>
+ </operation>
+ </portType>
+ <binding name="StockQuoteServiceBinding" type="tns:StockQuoteService">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="getStockQuoteBySymbol">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="StockQuoteService">
+ <port binding="tns:StockQuoteServiceBinding" name="StockQuoteServicePort">
+ <soap:address location="http://localhost:8080/SimpleWSWAR/StockQuoteService"/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.wsdl
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.wsdl (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.wsdl 2011-04-20 11:58:52 UTC (rev 30671)
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><definitions xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://test/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://test/" name="SampleWSService">
+<types>
+<xsd:schema>
+<xsd:import namespace="http://test/" schemaLocation="http://localhost:8080/A/SampleWSService?xsd=1" />
+</xsd:schema>
+<xsd:schema>
+<xsd:import namespace="http://example.com/ws/other" schemaLocation="http://localhost:8080/A/SampleWSService?xsd=2" />
+</xsd:schema>
+<xsd:schema>
+<xsd:import namespace="http://example.com/ws/b" schemaLocation="http://localhost:8080/A/SampleWSService?xsd=3" />
+</xsd:schema>
+<xsd:schema>
+<xsd:import namespace="http://example.com/ws/a" schemaLocation="http://localhost:8080/A/SampleWSService?xsd=4" />
+</xsd:schema>
+<xsd:schema>
+<xsd:import namespace="http://example.com/ws" schemaLocation="http://localhost:8080/A/SampleWSService?xsd=5" />
+</xsd:schema>
+<xsd:schema>
+<xsd:import namespace="http://example.com/attr/y" schemaLocation="http://localhost:8080/A/SampleWSService?xsd=6" />
+</xsd:schema>
+<xsd:schema>
+<xsd:import namespace="http://example.com/attr/x" schemaLocation="http://localhost:8080/A/SampleWSService?xsd=7" />
+</xsd:schema>
+<xsd:schema>
+<xsd:import namespace="http://example.com/attr/other" schemaLocation="http://localhost:8080/A/SampleWSService?xsd=8" />
+</xsd:schema>
+</types>
+<message name="echo">
+<part name="parameters" element="tns:echo" />
+</message>
+<message name="echoResponse">
+<part name="parameters" element="tns:echoResponse" />
+</message>
+<portType name="SampleWS">
+<operation name="echo">
+<input wsam:Action="http://test/SampleWS/echoRequest" message="tns:echo" />
+<output wsam:Action="http://test/SampleWS/echoResponse" message="tns:echoResponse" />
+</operation>
+</portType>
+<binding name="SampleWSPortBinding" type="tns:SampleWS">
+<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
+<operation name="echo">
+<soap:operation soapAction="" />
+<input>
+<soap:body use="literal" />
+</input>
+<output>
+<soap:body use="literal" />
+</output>
+</operation>
+</binding>
+<service name="SampleWSService">
+<port name="SampleWSPort" binding="tns:SampleWSPortBinding">
+<soap:address location="http://localhost:8080/A/SampleWSService" />
+</port>
+</service>
+</definitions>
\ No newline at end of file
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_1.xsd
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_1.xsd (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_1.xsd 2011-04-20 11:58:52 UTC (rev 30671)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:tns="http://test/" xmlns:ns1="http://example.com/ws" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://test/">
+
+<xs:import namespace="http://example.com/ws" schemaLocation="http://localhost:8080/A/SampleWSService?xsd=5" />
+
+<xs:element name="echo" type="tns:echo" />
+
+<xs:element name="echoResponse" type="tns:echoResponse" />
+
+<xs:complexType name="echo">
+<xs:sequence>
+<xs:element name="arg0" type="ns1:someType" minOccurs="0" />
+</xs:sequence>
+</xs:complexType>
+
+<xs:complexType name="echoResponse">
+<xs:sequence>
+<xs:element name="return" type="ns1:someType" minOccurs="0" />
+</xs:sequence>
+</xs:complexType>
+</xs:schema>
\ No newline at end of file
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_2.xsd
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_2.xsd (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_2.xsd 2011-04-20 11:58:52 UTC (rev 30671)
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:ns1="http://example.com/ws" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/ws/other">
+
+<xs:import namespace="http://example.com/ws" schemaLocation="http://localhost:8080/A/SampleWSService?xsd=5" />
+
+<xs:element name="OtherType" type="ns1:otherType" />
+</xs:schema>
\ No newline at end of file
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_3.xsd
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_3.xsd (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_3.xsd 2011-04-20 11:58:52 UTC (rev 30671)
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/ws/b">
+
+<xs:element name="B" type="xs:int" />
+
+<xs:element name="description" type="xs:string" />
+</xs:schema>
\ No newline at end of file
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_4.xsd
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_4.xsd (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_4.xsd 2011-04-20 11:58:52 UTC (rev 30671)
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/ws/a">
+
+<xs:element name="A" type="xs:int" />
+</xs:schema>
\ No newline at end of file
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_5.xsd
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_5.xsd (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_5.xsd 2011-04-20 11:58:52 UTC (rev 30671)
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:tns="http://example.com/ws" xmlns:ns6="http://example.com/attr/other" xmlns:ns5="http://example.com/ws/other" xmlns:ns4="http://example.com/attr/y" xmlns:ns3="http://example.com/attr/x" xmlns:ns2="http://example.com/ws/b" xmlns:ns1="http://example.com/ws/a" xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified" version="1.0" targetNamespace="http://example.com/ws">
+
+<xs:import namespace="http://example.com/ws/a" schemaLocation="http://localhost:8080/A/SampleWSService?xsd=4" />
+
+<xs:import namespace="http://example.com/ws/b" schemaLocation="http://localhost:8080/A/SampleWSService?xsd=3" />
+
+<xs:import namespace="http://example.com/attr/x" schemaLocation="http://localhost:8080/A/SampleWSService?xsd=7" />
+
+<xs:import namespace="http://example.com/attr/y" schemaLocation="http://localhost:8080/A/SampleWSService?xsd=6" />
+
+<xs:import namespace="http://example.com/ws/other" schemaLocation="http://localhost:8080/A/SampleWSService?xsd=2" />
+
+<xs:import namespace="http://example.com/attr/other" schemaLocation="http://localhost:8080/A/SampleWSService?xsd=8" />
+
+<xs:element name="SomeType" type="tns:someType" />
+
+<xs:complexType name="someType">
+<xs:sequence>
+<xs:element ref="ns1:A" />
+<xs:element ref="ns2:B" />
+<xs:element ref="ns5:OtherType" minOccurs="0" />
+</xs:sequence>
+<xs:attribute ref="ns3:C" use="required" />
+<xs:attribute ref="ns4:D" use="required" />
+</xs:complexType>
+
+<xs:complexType name="otherType">
+<xs:sequence>
+<xs:element ref="ns2:description" minOccurs="0" />
+</xs:sequence>
+<xs:attribute ref="ns6:myid" />
+<xs:attribute ref="ns3:Y" use="required" />
+</xs:complexType>
+</xs:schema>
\ No newline at end of file
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_6.xsd
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_6.xsd (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_6.xsd 2011-04-20 11:58:52 UTC (rev 30671)
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/attr/y">
+
+<xs:attribute name="D" type="xs:int" />
+</xs:schema>
\ No newline at end of file
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_7.xsd
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_7.xsd (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_7.xsd 2011-04-20 11:58:52 UTC (rev 30671)
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/attr/x">
+
+<xs:attribute name="C" type="xs:int" />
+
+<xs:attribute name="Y" type="xs:int" />
+</xs:schema>
\ No newline at end of file
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_8.xsd
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_8.xsd (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_8.xsd 2011-04-20 11:58:52 UTC (rev 30671)
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/attr/other">
+
+<xs:attribute name="myid" type="xs:string" />
+</xs:schema>
\ No newline at end of file
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/msg_in.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/msg_in.xml (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/msg_in.xml 2011-04-20 11:58:52 UTC (rev 30671)
@@ -0,0 +1,22 @@
+<?xml version="1.0" ?>
+<S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/">
+ <S:Body>
+ <ns8:echo
+ xmlns:ns2="http://example.com/ws/b"
+ xmlns:ns3="http://example.com/attr/other"
+ xmlns:ns4="http://example.com/attr/x"
+ xmlns:ns5="http://example.com/ws/other"
+ xmlns:ns6="http://example.com/attr/y"
+ xmlns:ns7="http://example.com/ws/a"
+ xmlns:ns8="http://test/"
+ xmlns:ns9="http://example.com/ws">
+ <arg0 ns6:D="4" ns4:C="3">
+ <ns7:A>1</ns7:A>
+ <ns2:B>2</ns2:B>
+ <ns5:OtherType ns4:Y="5" ns3:myid="myID">
+ <ns2:description>aDescription</ns2:description>
+ </ns5:OtherType>
+ </arg0>
+ </ns8:echo>
+ </S:Body>
+</S:Envelope>
\ No newline at end of file
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl 2011-04-20 11:58:52 UTC (rev 30671)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="SampleWSService" targetNamespace="http://test/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://test/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <wsdl:types>
+<xs:schema elementFormDefault="qualified" targetNamespace="http://test/" version="1.0" xmlns:ns1="http://example.com/ws" xmlns:tns="http://test/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:import namespace="http://example.com/ws"/>
+<xs:element name="echo" type="tns:echo"/>
+<xs:element name="echoResponse" type="tns:echoResponse"/>
+<xs:complexType name="echo">
+<xs:sequence>
+<xs:element minOccurs="0" name="arg0" type="ns1:someType"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="echoResponse">
+<xs:sequence>
+<xs:element minOccurs="0" name="return" type="ns1:someType"/>
+</xs:sequence>
+</xs:complexType>
+</xs:schema>
+<xs:schema targetNamespace="http://example.com/ws/other" version="1.0" xmlns:ns1="http://example.com/ws" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:import namespace="http://example.com/ws"/>
+<xs:element name="OtherType" type="ns1:otherType"/>
+</xs:schema>
+<xs:schema targetNamespace="http://example.com/ws/b" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:element name="B" type="xs:int"/>
+<xs:element name="description" type="xs:string"/>
+</xs:schema>
+<xs:schema targetNamespace="http://example.com/ws/a" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:element name="A" type="xs:int"/>
+</xs:schema>
+<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://example.com/ws" version="1.0" xmlns:ns1="http://example.com/ws/a" xmlns:ns2="http://example.com/ws/b" xmlns:ns3="http://example.com/attr/x" xmlns:ns4="http://example.com/attr/y" xmlns:ns5="http://example.com/ws/other" xmlns:ns6="http://example.com/attr/other" xmlns:tns="http://example.com/ws" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:import namespace="http://example.com/ws/a"/>
+<xs:import namespace="http://example.com/ws/b"/>
+<xs:import namespace="http://example.com/attr/x"/>
+<xs:import namespace="http://example.com/attr/y"/>
+<xs:import namespace="http://example.com/ws/other"/>
+<xs:import namespace="http://example.com/attr/other"/>
+<xs:element name="SomeType" type="tns:someType"/>
+<xs:complexType name="someType">
+<xs:sequence>
+<xs:element ref="ns1:A"/>
+<xs:element ref="ns2:B"/>
+<xs:element minOccurs="0" ref="ns5:OtherType"/>
+</xs:sequence>
+<xs:attribute ref="ns3:C" use="required"/>
+<xs:attribute ref="ns4:D" use="required"/>
+</xs:complexType>
+<xs:complexType name="otherType">
+<xs:sequence>
+<xs:element minOccurs="0" ref="ns2:description"/>
+</xs:sequence>
+<xs:attribute ref="ns6:myid"/>
+<xs:attribute ref="ns3:Y" use="required"/>
+</xs:complexType>
+</xs:schema>
+<xs:schema targetNamespace="http://example.com/attr/y" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:attribute name="D" type="xs:int"/>
+</xs:schema>
+<xs:schema targetNamespace="http://example.com/attr/x" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:attribute name="C" type="xs:int"/>
+<xs:attribute name="Y" type="xs:int"/>
+</xs:schema>
+<xs:schema targetNamespace="http://example.com/attr/other" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:attribute name="myid" type="xs:string"/>
+</xs:schema>
+ </wsdl:types>
+ <wsdl:message name="echoResponse">
+ <wsdl:part element="tns:echoResponse" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echo">
+ <wsdl:part element="tns:echo" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="SampleWS">
+ <wsdl:operation name="echo">
+ <wsdl:input message="tns:echo" name="echo">
+ </wsdl:input>
+ <wsdl:output message="tns:echoResponse" name="echoResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="SampleWSServiceSoapBinding" type="tns:SampleWS">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="echo">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="echo">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="echoResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="SampleWSService">
+ <wsdl:port binding="tns:SampleWSServiceSoapBinding" name="SampleWSPort">
+ <soap:address location="http://localhost:8080/ws/SampleWS"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml 2011-04-20 11:58:52 UTC (rev 30671)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+ <soap:Body>
+ <ns7:echo xmlns:ns1="http://example.com/ws/a" xmlns:ns2="http://example.com/ws/b"
+ xmlns:ns3="http://example.com/attr/other" xmlns:ns4="http://example.com/attr/x"
+ xmlns:ns5="http://example.com/ws/other" xmlns:ns6="http://example.com/attr/y"
+ xmlns:ns7="http://test/" xmlns:ns8="http://example.com/ws">
+ <ns7:arg0 ns4:C="3" ns6:D="4">
+ <ns1:A>1</ns1:A>
+ <ns2:B>2</ns2:B>
+ <ns5:OtherType ns3:myid="myID" ns4:Y="5">
+ <ns2:description>aDescription</ns2:description>
+ </ns5:OtherType>
+ </ns7:arg0>
+ </ns7:echo>
+ </soap:Body>
+</soap:Envelope>
\ No newline at end of file
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30670 - trunk/smooks/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-04-20 00:30:07 -0400 (Wed, 20 Apr 2011)
New Revision: 30670
Modified:
trunk/smooks/docs/reference/en-US/tasks.xml
Log:
corrected typo
Modified: trunk/smooks/docs/reference/en-US/tasks.xml
===================================================================
--- trunk/smooks/docs/reference/en-US/tasks.xml 2011-04-20 04:22:52 UTC (rev 30669)
+++ trunk/smooks/docs/reference/en-US/tasks.xml 2011-04-20 04:30:07 UTC (rev 30670)
@@ -89,7 +89,7 @@
<section>
<title>Direct source to target mapping</title>
<para>
- A new implified mapping process is supported within the Smooks Editor called <emphasis>Direct source to target mapping</emphasis>. This allows for you to skip the intermediate Java mapping step when applying a template to your data.
+ A new simplified mapping process is supported within the Smooks Editor called <emphasis>Direct source to target mapping</emphasis>. This allows for you to skip the intermediate Java mapping step when applying a template to your data.
</para>
<para>
An example of the new editor performing a transformation (EDI to XML):
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30669 - in trunk/smooks/docs/reference/en-US: images/process_page and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-04-20 00:22:52 -0400 (Wed, 20 Apr 2011)
New Revision: 30669
Added:
trunk/smooks/docs/reference/en-US/images/process_page/direct_source_to_target_mapping_1.png
Modified:
trunk/smooks/docs/reference/en-US/tasks.xml
Log:
updated with new screenshot and info relating to TOOLSDOC-121
Added: trunk/smooks/docs/reference/en-US/images/process_page/direct_source_to_target_mapping_1.png
===================================================================
(Binary files differ)
Property changes on: trunk/smooks/docs/reference/en-US/images/process_page/direct_source_to_target_mapping_1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/smooks/docs/reference/en-US/tasks.xml
===================================================================
--- trunk/smooks/docs/reference/en-US/tasks.xml 2011-04-20 04:11:38 UTC (rev 30668)
+++ trunk/smooks/docs/reference/en-US/tasks.xml 2011-04-20 04:22:52 UTC (rev 30669)
@@ -91,6 +91,17 @@
<para>
A new implified mapping process is supported within the Smooks Editor called <emphasis>Direct source to target mapping</emphasis>. This allows for you to skip the intermediate Java mapping step when applying a template to your data.
</para>
+ <para>
+ An example of the new editor performing a transformation (EDI to XML):
+ </para>
+ <figure>
+ <title>Java Mapping configuration</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/process_page/direct_source_to_target_mapping_1.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
</section>
<section id="mapping">
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30668 - trunk/smooks/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-04-20 00:11:38 -0400 (Wed, 20 Apr 2011)
New Revision: 30668
Modified:
trunk/smooks/docs/reference/en-US/tasks.xml
Log:
began work on writing up info reguarding TOOLSDOC-121
Modified: trunk/smooks/docs/reference/en-US/tasks.xml
===================================================================
--- trunk/smooks/docs/reference/en-US/tasks.xml 2011-04-20 02:40:46 UTC (rev 30667)
+++ trunk/smooks/docs/reference/en-US/tasks.xml 2011-04-20 04:11:38 UTC (rev 30668)
@@ -75,15 +75,24 @@
</figure>
</section>
<section>
- <title>"Java Mapping" or "Apply Template"?</title>
-
- <para>
- Though there are many options in Smooks regarding what you can do with input data, such as transformation, routing, and persistence, this version of the Smooks Configuration Editor focuses only on mapping to java and applying templates to create different output formats. If you have a set of Java classes you want to use the incoming data for, you can use the "Java Mapping" task to specify those classes and use drag and drop to map between the input model generated by the reader and elements in the output model. Or if you simply want to transform your output to one or more formats, you can use the <guilabel>Apply Template</guilabel> task to map it to a CSV file, XML or XSD file (with other formats being provided in the future).
- <note><title>Note</title>
- <para>You can't transform your output directly using only Input and Template tasks. You should use Mapping as an interagent between these tasks.</para>
- </note>
- </para>
- </section>
+ <title>Mapping processes</title>
+ <para>
+ In previous versions of the Smooks tooling you were required to manually create a java mapping task before applying a transformation template to the data. A new method is now available called <emphasis>Direct source to target mapping</emphasis>. This allows you to skip the manual creation of Java mapping and apply a template directly to your data.
+ </para>
+ <!-- <para>
+ Though there are many options in Smooks regarding what you can do with input data, such as transformation, routing, and persistence, this version of the Smooks Configuration Editor focuses only on mapping to java and applying templates to create different output formats. If you have a set of Java classes you want to use the incoming data for, you can use the "Java Mapping" task to specify those classes and use drag and drop to map between the input model generated by the reader and elements in the output model. Or if you simply want to transform your output to one or more formats, you can use the <guilabel>Apply Template</guilabel> task to map it to a CSV file, XML or XSD file (with other formats being provided in the future).
+ <note>
+ <title>Note</title>
+ <para>You can't transform your output directly using only Input and Template tasks. You should use Mapping as an interagent between these tasks.</para>
+ </note>
+ </para> -->
+ <section>
+ <title>Direct source to target mapping</title>
+ <para>
+ A new implified mapping process is supported within the Smooks Editor called <emphasis>Direct source to target mapping</emphasis>. This allows for you to skip the intermediate Java mapping step when applying a template to your data.
+ </para>
+ </section>
+
<section id="mapping">
<title>Java Mapping Task</title>
@@ -180,6 +189,7 @@
</mediaobject>
</figure>
</section>
+</section>
<section>
<title>Smooks Configuration testing using Smooks Run Configuration</title>
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30667 - in trunk/download.jboss.org/jbosstools/updates: indigo and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-19 22:40:46 -0400 (Tue, 19 Apr 2011)
New Revision: 30667
Modified:
trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/requirements/index.html
Log:
remove findbugs from composite reqs site; add springide and testng
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-04-19 20:36:24 UTC (rev 30666)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-04-20 02:40:46 UTC (rev 30667)
@@ -4,12 +4,17 @@
<properties size='2'>
<property name='p2.compressed' value='true'/>
<!--
- get new time w/
- date +%s000
+" add this to your ~/.vimrc file, then use \ts to update timestamp to current
+fun! ReplaceTimestamp()
+ let tstamp = strftime("%s000")
+ exe ":%s#<property name='p2.timestamp' value='[0-9]\\+'/>#<property name='p2.timestamp' value='" . tstamp . "'/>#g"
+ echo "New time: " . tstamp
+endfun
+nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1303164158000'/>
+<property name='p2.timestamp' value='1303264329000'/>
</properties>
-<children size='20'>
+<children size='19'>
<child location='../requirements/helios/SR2/'/>
<child location='../requirements/birt/2.6.2/'/>
<child location='../requirements/ecf/3.4/'/>
@@ -17,7 +22,6 @@
<child location='../requirements/egit/0.11/'/>
<child location='../requirements/emf/2.6/'/>
-<child location='../requirements/findbugs/1.3.9/'/>
<child location='../requirements/gwt/201012211742/'/>
<child location='../requirements/mylyn/3.6/'/>
<child location='../requirements/m2eclipse/0.12/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-04-19 20:36:24 UTC (rev 30666)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-04-20 02:40:46 UTC (rev 30667)
@@ -4,12 +4,17 @@
<properties size='2'>
<property name='p2.compressed' value='true'/>
<!--
- get new time w/
- date +%s000
+" add this to your ~/.vimrc file, then use \ts to update timestamp to current
+fun! ReplaceTimestamp()
+ let tstamp = strftime("%s000")
+ exe ":%s#<property name='p2.timestamp' value='[0-9]\\+'/>#<property name='p2.timestamp' value='" . tstamp . "'/>#g"
+ echo "New time: " . tstamp
+endfun
+nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1303164158000'/>
+<property name='p2.timestamp' value='1303264329000'/>
</properties>
-<children size='20'>
+<children size='19'>
<child location='../requirements/helios/SR2/'/>
<child location='../requirements/birt/2.6.2/'/>
<child location='../requirements/ecf/3.4/'/>
@@ -17,7 +22,6 @@
<child location='../requirements/egit/0.11/'/>
<child location='../requirements/emf/2.6/'/>
-<child location='../requirements/findbugs/1.3.9/'/>
<child location='../requirements/gwt/201012211742/'/>
<child location='../requirements/mylyn/3.6/'/>
<child location='../requirements/m2eclipse/0.12/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-04-19 20:36:24 UTC (rev 30666)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-04-20 02:40:46 UTC (rev 30667)
@@ -4,12 +4,17 @@
<properties size='2'>
<property name='p2.compressed' value='true'/>
<!--
- get new time w/
- date +%s000
+" add this to your ~/.vimrc file, then use \ts to update timestamp to current
+fun! ReplaceTimestamp()
+ let tstamp = strftime("%s000")
+ exe ":%s#<property name='p2.timestamp' value='[0-9]\\+'/>#<property name='p2.timestamp' value='" . tstamp . "'/>#g"
+ echo "New time: " . tstamp
+endfun
+nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1303164359000'/>
+<property name='p2.timestamp' value='1303264329000'/>
</properties>
-<children size='20'>
+<children size='19'>
<child location='../requirements/indigo/201103180900-M6/'/>
<child location='../requirements/birt/4.0M6/'/>
<child location='../requirements/eclipse/3.7M6/'/>
@@ -18,7 +23,6 @@
<child location='../requirements/ecf/3.5/'/>
<child location='../requirements/egit/0.11/'/>
-<child location='../requirements/findbugs/1.3.9/'/>
<child location='../requirements/gwt/201102111811/'/>
<child location='../requirements/jslint/1.5/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-04-19 20:36:24 UTC (rev 30666)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-04-20 02:40:46 UTC (rev 30667)
@@ -4,12 +4,17 @@
<properties size='2'>
<property name='p2.compressed' value='true'/>
<!--
- get new time w/
- date +%s000
+" add this to your ~/.vimrc file, then use \ts to update timestamp to current
+fun! ReplaceTimestamp()
+ let tstamp = strftime("%s000")
+ exe ":%s#<property name='p2.timestamp' value='[0-9]\\+'/>#<property name='p2.timestamp' value='" . tstamp . "'/>#g"
+ echo "New time: " . tstamp
+endfun
+nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1303164359000'/>
+<property name='p2.timestamp' value='1303264329000'/>
</properties>
-<children size='20'>
+<children size='19'>
<child location='../requirements/indigo/201103180900-M6/'/>
<child location='../requirements/birt/4.0M6/'/>
<child location='../requirements/eclipse/3.7M6/'/>
@@ -18,7 +23,6 @@
<child location='../requirements/ecf/3.5/'/>
<child location='../requirements/egit/0.11/'/>
-<child location='../requirements/findbugs/1.3.9/'/>
<child location='../requirements/gwt/201102111811/'/>
<child location='../requirements/jslint/1.5/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/index.html 2011-04-19 20:36:24 UTC (rev 30666)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/index.html 2011-04-20 02:40:46 UTC (rev 30667)
@@ -52,19 +52,20 @@
<li><a class=link href=ecf>ecf</a></li>
<li><a class=link href=eclipse>eclipse</a></li>
<li><a class=link href=emf>emf</a></li>
-<li><a class=link href=findbugs>findbugs</a></li>
-<li><a class=link href=gwt/201102111811>gwt/201102111811</a></li>
+<!-- <li><a class=link href=findbugs>findbugs</a></li> -->
+<!-- <li><a class=link href=gwt/201102111811>gwt/201102111811</a></li> -->
<li><a class=link href=jslint>jslint</a></li>
<li><a class=link href=mylyn>mylyn</a> (including connectors for: Eclipse/PDE/Java, JIRA, Bugzilla, CVS, SVN, Git)</li>
-<li><a class=link href=m2eclipse>m2eclipse/0.13</a></li>
+<li><a class=link href=m2eclipse>m2eclipse</a></li>
<li><a class=link href=orbit/S20110124210048>orbit/S20110124210048</a></li>
<li><a class=link href=pmd>pmd</a></li>
+<li><a class=link href=springide>springide</a></li>
<li><a class=link href=subclipse>subclipse</a></li>
<li><a class=link href=subversive>subversive</a></li>
-<li><a class=link href=swtbot/2.0.3>swtbot/2.0.3</a></li>
+<li><a class=link href=swtbot>swtbot</a></li>
+<li><a class=link href=testng>testng</a></li>
<li><a class=link href=webtools>webtools</a></li>
-<li><a class=link href=xulrunner-1.9.1.2>xulrunner-1.9.1.2</a></li>
-<li><a class=link href=xulrunner-1.9.2>xulrunner-1.9.2</a> (?)</li>
+<li><a class=link href=xulrunner-1.9.2>xulrunner-1.9.2</a></li>
<p>
<h2>JBoss Tools 3.2 / Eclipse 3.6 Helios / Web Tools 3.2</h2>
<li><a class=link href=helios>helios</a></li>
@@ -73,16 +74,18 @@
<li><a class=link href=eclipse>eclipse/3.6</a></li>
<li><a class=link href=egit>egit</a></li>
<li><a class=link href=emf>emf/2.6</a></li>
-<li><a class=link href=findbugs>findbugs</a></li>
+<!-- <li><a class=link href=findbugs>findbugs</a></li> -->
<li><a class=link href=gwt/201012211742>gwt/201012211742</a></li>
<li><a class=link href=mylyn>mylyn</a> (including connectors for: Eclipse/PDE/Java, JIRA, Bugzilla, CVS, SVN, Git)</li>
<li><a class=link href=m2eclipse/0.12>m2eclipse/0.12</a></li>
<li><a class=link href=orbit/R20100519200754>orbit/R20100519200754</a></li>
<li><a class=link href=pmd>pmd</a></li>
-<li><a class=link href=thirdparty>thirdparty</a> (deprecated)</li>
+<li><a class=link href=springide>springide</a></li>
<li><a class=link href=subclipse/1.6>subclipse/1.6</a></li>
<li><a class=link href=subversive/0.7.9_2.2.2>subversive/0.7.9_2.2.2</a></li>
<li><a class=link href=swtbot/2.0.3>swtbot/2.0.3</a></li>
+<li><a class=link href=testng>testng</a></li>
+<li><a class=link href=thirdparty>thirdparty</a> (deprecated)</li>
<li><a class=link href=tptp>tptp/4.7</a></li>
<li><a class=link href=webtools/3.2.3>webtools/3.2.3</a></li>
<li><a class=link href=xulrunner-1.9.1.2>xulrunner-1.9.1.2</a></li>
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30665 - trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-04-19 14:40:53 -0400 (Tue, 19 Apr 2011)
New Revision: 30665
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/Activator.java
Log:
JBIDE-8754 - initial server lifecycle listener not added
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/Activator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/Activator.java 2011-04-19 18:36:38 UTC (rev 30664)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/Activator.java 2011-04-19 18:40:53 UTC (rev 30665)
@@ -1,6 +1,7 @@
package org.jboss.ide.eclipse.as.jmx.integration;
import org.eclipse.core.runtime.Plugin;
+import org.jboss.ide.eclipse.as.core.server.UnitedServerListenerManager;
import org.osgi.framework.BundleContext;
/**
@@ -27,6 +28,7 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
+ UnitedServerListenerManager.getDefault().addListener(JMXServerLifecycleListener.getDefault());
}
/*
@@ -34,6 +36,7 @@
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
public void stop(BundleContext context) throws Exception {
+ UnitedServerListenerManager.getDefault().removeListener(JMXServerLifecycleListener.getDefault());
plugin = null;
super.stop(context);
}
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30664 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test: projects/CDISolderTest/src/org/jboss/unwraps and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-19 14:36:38 -0400 (Tue, 19 Apr 2011)
New Revision: 30664
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Current.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Permission.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Unwrapped.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/UnwrapsTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java
Log:
JBIDE-8715
https://issues.jboss.org/browse/JBIDE-8715
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Current.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Current.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Current.java 2011-04-19 18:36:38 UTC (rev 30664)
@@ -0,0 +1,21 @@
+package org.jboss.unwraps;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Current {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Current.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Permission.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Permission.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Permission.java 2011-04-19 18:36:38 UTC (rev 30664)
@@ -0,0 +1,5 @@
+package org.jboss.unwraps;
+
+public class Permission {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Permission.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Unwrapped.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Unwrapped.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Unwrapped.java 2011-04-19 18:36:38 UTC (rev 30664)
@@ -0,0 +1,17 @@
+package org.jboss.unwraps;
+
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.unwraps.Unwraps;
+
+public class Unwrapped {
+
+ @Unwraps @Current
+ Permission getPermission() {
+ return new Permission();
+ }
+
+ @Inject @Current
+ Permission permission;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Unwrapped.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java 2011-04-19 18:36:10 UTC (rev 30663)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java 2011-04-19 18:36:38 UTC (rev 30664)
@@ -31,6 +31,7 @@
suiteAll.addTestSuite(MessageLoggerTest.class);
suiteAll.addTestSuite(ServiceHandlerTest.class);
suiteAll.addTestSuite(DefaultBeanTest.class);
+ suiteAll.addTestSuite(UnwrapsTest.class);
SeamSolderTestSetup suite = new SeamSolderTestSetup(suiteAll);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java 2011-04-19 18:36:10 UTC (rev 30663)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java 2011-04-19 18:36:38 UTC (rev 30664)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.seam.solder.core.test;
+import java.util.Iterator;
import java.util.Set;
import junit.framework.TestCase;
@@ -22,6 +23,7 @@
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.IProducer;
import org.jboss.tools.test.util.ResourcesUtils;
/**
@@ -64,6 +66,11 @@
protected IInjectionPointField getInjectionPointField(ICDIProject cdi, String beanClassFilePath, String fieldName) {
IFile file = cdi.getNature().getProject().getFile(beanClassFilePath);
Set<IBean> beans = cdi.getBeans(file.getFullPath());
+ Iterator<IBean> it = beans.iterator();
+ while(it.hasNext()) {
+ IBean b = it.next();
+ if(b instanceof IProducer) it.remove();
+ }
assertEquals("Wrong number of the beans", 1, beans.size());
Set<IInjectionPoint> injections = beans.iterator().next().getInjectionPoints();
for (IInjectionPoint injectionPoint : injections) {
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/UnwrapsTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/UnwrapsTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/UnwrapsTest.java 2011-04-19 18:36:38 UTC (rev 30664)
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * 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.cdi.seam.solder.core.test;
+
+import java.io.IOException;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.IProducerMethod;
+import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class UnwrapsTest extends SeamSolderTest {
+
+ public UnwrapsTest() {}
+
+ public void testUnwraps() throws CoreException, IOException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(project, true);
+
+ IInjectionPointField logger = getInjectionPointField(cdi, "src/org/jboss/unwraps/Unwrapped.java", "permission");
+
+ Set<IBean> bs = cdi.getBeans(false, logger);
+ assertEquals(1, bs.size());
+
+ IBean b = bs.iterator().next();
+
+ assertTrue(b instanceof IProducerMethod);
+
+ IProducerMethod m = (IProducerMethod)b;
+ assertTrue(m.isAnnotationPresent(CDISeamSolderConstants.UNWRAPS_ANNOTATION_TYPE_NAME));
+ assertEquals("getPermission", m.getMethod().getElementName());
+
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/UnwrapsTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 12 months
- 1
- 0