JBoss Tools SVN: r8663 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-06-10 05:27:51 -0400 (Tue, 10 Jun 2008)
New Revision: 8663
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
Log:
Write junit for http://jira.jboss.com/jira/browse/JBIDE-1791 issue.
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2008-06-10 08:09:11 UTC (rev 8662)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2008-06-10 09:27:51 UTC (rev 8663)
@@ -1,5 +1,9 @@
package org.jboss.tools.jst.jsp.test;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.tools.jst.jsp.test.ca.Jbide1791Test;
import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1704Test;
import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1717Test;
import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1807Test;
@@ -9,9 +13,6 @@
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1759Test;
import org.jboss.tools.jst.jsp.test.ca.StrutsJspJbide1648Test;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
public class JstJspAllTests {
public static Test suite() {
@@ -25,6 +26,7 @@
suite.addTestSuite(JsfJspJbide1704Test.class);
suite.addTestSuite(JsfJspJbide1717Test.class);
suite.addTestSuite(JstJspJbide1759Test.class);
+ suite.addTestSuite(Jbide1791Test.class);
return suite;
}
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8662 - trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-06-10 04:09:11 -0400 (Tue, 10 Jun 2008)
New Revision: 8662
Modified:
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java
Log:
JBIDE-2261: add validation for changing runtime location name
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java 2008-06-10 07:49:43 UTC (rev 8661)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java 2008-06-10 08:09:11 UTC (rev 8662)
@@ -11,19 +11,23 @@
package org.jboss.tools.ws.core.classpath;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.jface.preference.IPersistentPreferenceStore;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.jboss.tools.ws.core.JbossWSCorePlugin;
+import org.jboss.tools.ws.core.facet.delegate.IJBossWSFacetDataModelProperties;
import org.jboss.tools.ws.core.messages.JbossWSCoreMessages;
/**
@@ -31,217 +35,232 @@
*/
public class JbossWSRuntimeManager {
- private static JbossWSRuntimeListConverter converter = new JbossWSRuntimeListConverter();
+ private static JbossWSRuntimeListConverter converter = new JbossWSRuntimeListConverter();
- private Map<String, JbossWSRuntime> runtimes = new HashMap<String, JbossWSRuntime>();
+ private Map<String, JbossWSRuntime> runtimes = new HashMap<String, JbossWSRuntime>();
- /**
- * Private constructor
- */
- private JbossWSRuntimeManager() {
- IPreferenceStore ps = JbossWSCorePlugin.getDefault().getPreferenceStore();
-
- String runtimeListString = ps.getString(JbossWSCoreMessages.WS_Location);
+ /**
+ * Private constructor
+ */
+ private JbossWSRuntimeManager() {
+ IPreferenceStore ps = JbossWSCorePlugin.getDefault()
+ .getPreferenceStore();
- runtimes = converter.getMap(runtimeListString);
- }
+ String runtimeListString = ps
+ .getString(JbossWSCoreMessages.WS_Location);
- /**
- * This class make Java Runtime responsible for solving synchronization
- * problems during initialization if there is any
- *
- */
- static class JbossWSRuntimeManagerHolder {
- private static final JbossWSRuntimeManager INSTANCE = new JbossWSRuntimeManager();
- }
+ runtimes = converter.getMap(runtimeListString);
+ }
- /**
- * Return JbossWSRuntimeManaher instance
- *
- * @return
- * JbossWSRuntimeManager instance
- */
- public static JbossWSRuntimeManager getInstance() {
- return JbossWSRuntimeManagerHolder.INSTANCE;
+ /**
+ * This class make Java Runtime responsible for solving synchronization
+ * problems during initialization if there is any
+ *
+ */
+ static class JbossWSRuntimeManagerHolder {
+ private static final JbossWSRuntimeManager INSTANCE = new JbossWSRuntimeManager();
+ }
+
+ /**
+ * Return JbossWSRuntimeManaher instance
+ *
+ * @return JbossWSRuntimeManager instance
+ */
+ public static JbossWSRuntimeManager getInstance() {
+ return JbossWSRuntimeManagerHolder.INSTANCE;
+ }
+
+ /**
+ * Return Array of configured JbossWSRuntimes
+ *
+ * @return JbossWSRuntime[]
+ */
+ public JbossWSRuntime[] getRuntimes() {
+ Collection<JbossWSRuntime> c = runtimes.values();
+ return c.toArray(new JbossWSRuntime[runtimes.size()]);
+ }
+
+ /**
+ * Add new JbossWSRuntime
+ *
+ * @param runtime
+ * JbossWSRuntime
+ */
+ public void addRuntime(JbossWSRuntime runtime) {
+ if (runtimes.size() == 0) {
+ runtime.setDefault(true);
}
- /**
- * Return Array of configured JbossWSRuntimes
- *
- * @return
- * JbossWSRuntime[]
- */
- public JbossWSRuntime[] getRuntimes() {
- Collection<JbossWSRuntime> c = runtimes.values();
- return c.toArray(new JbossWSRuntime[runtimes.size()]);
+ JbossWSRuntime oldDefaultRuntime = getDefaultRuntime();
+ if (oldDefaultRuntime != null && runtime.isDefault()) {
+ oldDefaultRuntime.setDefault(false);
}
+ runtimes.put(runtime.getName(), runtime);
+ save();
+ }
- /**
- * Add new JbossWSRuntime
- *
- * @param runtime
- * JbossWSRuntime
- */
- public void addRuntime(JbossWSRuntime runtime) {
- if (runtimes.size() == 0) {
- runtime.setDefault(true);
- }
+ /**
+ * Add new JbossWSRuntime with given parameters
+ *
+ * @param name
+ * String - runtime name
+ * @param path
+ * String - runtime home folder
+ * @param version
+ * String - string representation of version number
+ * @param defaultRt
+ * boolean - default flag
+ */
+ public void addRuntime(String name, String path, boolean defaultRt) {
+ JbossWSRuntime jbossWSRt = new JbossWSRuntime();
+ jbossWSRt.setHomeDir(path);
+ jbossWSRt.setName(name);
+ jbossWSRt.setDefault(defaultRt);
+ addRuntime(jbossWSRt);
+ }
- JbossWSRuntime oldDefaultRuntime = getDefaultRuntime();
- if (oldDefaultRuntime != null && runtime.isDefault()) {
- oldDefaultRuntime.setDefault(false);
+ /**
+ * Return JbossWSRuntime by given name
+ *
+ * @param name
+ * String - JbossWSRuntime name
+ * @return JbossWSRuntime - found JbossWSRuntime instance or null
+ */
+ public JbossWSRuntime findRuntimeByName(String name) {
+ for (JbossWSRuntime jbossWSRuntime : runtimes.values()) {
+ if (jbossWSRuntime.getName().equals(name)) {
+ return jbossWSRuntime;
}
- runtimes.put(runtime.getName(), runtime);
- save();
}
+ return null;
+ }
- /**
- * Add new JbossWSRuntime with given parameters
- *
- * @param name
- * String - runtime name
- * @param path
- * String - runtime home folder
- * @param version
- * String - string representation of version number
- * @param defaultRt
- * boolean - default flag
- */
- public void addRuntime(String name, String path,
- boolean defaultRt) {
- JbossWSRuntime jbossWSRt = new JbossWSRuntime();
- jbossWSRt.setHomeDir(path);
- jbossWSRt.setName(name);
- jbossWSRt.setDefault(defaultRt);
- addRuntime(jbossWSRt);
- }
+ /**
+ * Remove given JbossWSRuntime from manager
+ *
+ * @param rt
+ * JbossWSRuntime
+ */
+ public void removeRuntime(JbossWSRuntime rt) {
+ runtimes.remove(rt.getName());
+ }
- /**
- * Return JbossWSRuntime by given name
- *
- * @param name
- * String - JbossWSRuntime name
- * @return
- * JbossWSRuntime - found JbossWSRuntime instance or null
- */
- public JbossWSRuntime findRuntimeByName(String name) {
- for (JbossWSRuntime jbossWSRuntime : runtimes.values()) {
- if (jbossWSRuntime.getName().equals(name)) {
- return jbossWSRuntime;
- }
+ /**
+ * Save preference value and force save changes to disk
+ */
+ public void save() {
+ JbossWSCorePlugin.getDefault().getPreferenceStore().setValue(
+ "jbosswsruntimelocation", converter.getString(runtimes));
+ IPreferenceStore store = JbossWSCorePlugin.getDefault()
+ .getPreferenceStore();
+ if (store instanceof IPersistentPreferenceStore) {
+ try {
+ ((IPersistentPreferenceStore) store).save();
+ } catch (IOException e) {
+ e.printStackTrace();
}
- return null;
}
+ }
- /**
- * Remove given JbossWSRuntime from manager
- * @param rt
- * JbossWSRuntime
- */
- public void removeRuntime(JbossWSRuntime rt) {
- runtimes.remove(rt.getName());
+ /**
+ * Marks this runtime as default. Marks other runtimes with the same version
+ * as not default.
+ *
+ * @param runtime
+ */
+ public void setDefaultRuntime(JbossWSRuntime runtime) {
+ JbossWSRuntime[] runtimes = getRuntimes();
+ for (int i = 0; i < runtimes.length; i++) {
+ runtimes[i].setDefault(false);
}
+ runtime.setDefault(true);
+ }
-
- /**
- * Save preference value and force save changes to disk
- */
- public void save() {
- JbossWSCorePlugin.getDefault().getPreferenceStore().setValue(
- "jbosswsruntimelocation",
- converter.getString(runtimes));
- IPreferenceStore store = JbossWSCorePlugin.getDefault().getPreferenceStore();
- if (store instanceof IPersistentPreferenceStore) {
- try {
- ((IPersistentPreferenceStore) store).save();
- } catch (IOException e) {
- e.printStackTrace();
- }
+ /**
+ * Return first default JbossWSRuntime
+ *
+ * @return JbossWSRuntime
+ */
+ public JbossWSRuntime getDefaultRuntime() {
+ for (JbossWSRuntime rt : runtimes.values()) {
+ if (rt.isDefault()) {
+ return rt;
}
}
+ return null;
+ }
- /**
- * Marks this runtime as default. Marks other runtimes with the same version as not default.
- * @param runtime
- */
- public void setDefaultRuntime(JbossWSRuntime runtime) {
- JbossWSRuntime[] runtimes = getRuntimes();
- for (int i = 0; i < runtimes.length; i++) {
- runtimes[i].setDefault(false);
- }
- runtime.setDefault(true);
+ /**
+ * Return list of available JbossWSRuntime names
+ *
+ * @return List<String>
+ */
+ public List<String> getRuntimeNames() {
+ JbossWSRuntime[] rts = getRuntimes();
+ List<String> result = new ArrayList<String>();
+ for (JbossWSRuntime jbossWSRuntime : rts) {
+ result.add(jbossWSRuntime.getName());
}
+ return result;
+ }
- /**
- * Return first default JbossWSRuntime
- *
- * @return
- * JbossWSRuntime
- */
- public JbossWSRuntime getDefaultRuntime() {
- for (JbossWSRuntime rt : runtimes.values()) {
- if (rt.isDefault()) {
- return rt;
- }
- }
- return null;
+ /**
+ * Return a list of all runtime names
+ *
+ * @return List of all runtime names
+ */
+ public List<String> getAllRuntimeNames() {
+ JbossWSRuntime[] rts = getRuntimes();
+ List<String> result = new ArrayList<String>();
+ for (JbossWSRuntime jbossWSRuntime : rts) {
+ result.add(jbossWSRuntime.getName());
}
+ return result;
+ }
+ /**
+ * TBD
+ *
+ * @param oldName
+ * old runtime name
+ * @param newName
+ * new runtime name
+ */
+ public void changeRuntimeName(String oldName, String newName) {
+ JbossWSRuntime o = findRuntimeByName(oldName);
+ if (o == null) {
+ return;
+ }
+ o.setName(newName);
+ onRuntimeNameChanged(oldName, newName);
+ }
- /**
- * Return list of available JbossWSRuntime names
- *
- * @return
- * List<String>
- */
- public List<String> getRuntimeNames() {
- JbossWSRuntime[] rts = getRuntimes();
- List<String> result = new ArrayList<String>();
- for (JbossWSRuntime jbossWSRuntime : rts) {
- result.add(jbossWSRuntime.getName());
- }
- return result;
+ private void onRuntimeNameChanged(String oldName, String newName) {
+ IProjectFacet facet = ProjectFacetsManager
+ .getProjectFacet("jbossws.core");
+ Set<IFacetedProject> facetedProjects = null;
+ try {
+ facetedProjects = ProjectFacetsManager.getFacetedProjects(facet);
+ } catch (CoreException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
}
-
- /**
- * Return a list of all runtime names
- *
- * @return
- * List of all runtime names
- */
- public List<String> getAllRuntimeNames() {
- JbossWSRuntime[] rts = getRuntimes();
- List<String> result = new ArrayList<String>();
- for (JbossWSRuntime jbossWSRuntime : rts) {
- result.add(jbossWSRuntime.getName());
+ for (IFacetedProject facetedProject : facetedProjects) {
+ QualifiedName qRuntimeName = new QualifiedName(
+ IJBossWSFacetDataModelProperties.QUALIFIEDNAME_IDENTIFIER_IS_SERVER_SUPPLIED,
+ IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID);
+ String name = null;
+ try {
+ name = facetedProject.getProject().getPersistentProperty(qRuntimeName);
+ if (name != null && name.equals(oldName)) {
+ facetedProject.getProject().setPersistentProperty(qRuntimeName, newName);
+ }
+ } catch (CoreException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
}
- return result;
- }
- /**
- * TBD
- *
- * @param oldName
- * old runtime name
- * @param newName
- * new runtime name
- */
- public void changeRuntimeName(String oldName, String newName) {
- JbossWSRuntime o = findRuntimeByName(oldName);
- if (o == null) {
- return;
- }
- o.setName(newName);
- onRuntimeNameChanged(oldName, newName);
}
+ }
- private void onRuntimeNameChanged(String oldName, String newName) {
- IProject[] ps = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-// for (int i = 0; i < ps.length; i++) {
-// ISeamProject sp = SeamCorePlugin.getSeamProject(ps[i], false);
-// if (sp != null && oldName.equals(sp.getRuntimeName())) {
-// sp.setRuntimeName(newName);
-// }
-// }
- }
}
\ No newline at end of file
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8661 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-06-10 03:49:43 -0400 (Tue, 10 Jun 2008)
New Revision: 8661
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/SliderCellEditorEx.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/SliderEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/SliderFieldEditor.java
Log:
Copyright notes were added to classes.
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/SliderCellEditorEx.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/SliderCellEditorEx.java 2008-06-10 07:49:35 UTC (rev 8660)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/SliderCellEditorEx.java 2008-06-10 07:49:43 UTC (rev 8661)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.common.model.ui.attribute.editor;
import org.eclipse.jface.viewers.CellEditor;
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/SliderEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/SliderEditor.java 2008-06-10 07:49:35 UTC (rev 8660)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/SliderEditor.java 2008-06-10 07:49:43 UTC (rev 8661)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.common.model.ui.attribute.editor;
import org.eclipse.jface.viewers.CellEditor;
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/SliderFieldEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/SliderFieldEditor.java 2008-06-10 07:49:35 UTC (rev 8660)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/SliderFieldEditor.java 2008-06-10 07:49:43 UTC (rev 8661)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.common.model.ui.attribute.editor;
import java.beans.PropertyChangeListener;
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8660 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-06-10 03:49:35 -0400 (Tue, 10 Jun 2008)
New Revision: 8660
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java
Log:
Copyright notes were added to classes.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java 2008-06-10 06:35:14 UTC (rev 8659)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java 2008-06-10 07:49:35 UTC (rev 8660)
@@ -1,6 +1,13 @@
-/**
- *
- */
+/*******************************************************************************
+ * Copyright (c) 2007-2008 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.vpe.jsf.test.jbide;
import java.util.ArrayList;
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8659 - in trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui: preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-06-10 02:35:14 -0400 (Tue, 10 Jun 2008)
New Revision: 8659
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUI.properties
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUIMessages.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java
Log:
JBIDE-2261: improve the runtime location validation
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUI.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUI.properties 2008-06-10 05:58:36 UTC (rev 8658)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUI.properties 2008-06-10 06:35:14 UTC (rev 8659)
@@ -2,6 +2,9 @@
Command=wsconsume.sh
Bin=bin
+Client=client
+Lib=lib
+Endorsed=endorsed
Error_JBossWS_Basic_Editor_Composite=Parent control should be Composite
Error_JBossWS_Basic_Editor_Support=Editor supports only grid layout
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUIMessages.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUIMessages.java 2008-06-10 05:58:36 UTC (rev 8658)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUIMessages.java 2008-06-10 06:35:14 UTC (rev 8659)
@@ -29,6 +29,9 @@
public static String Bin;
public static String Command;
+ public static String Client;
+ public static String Lib;
+ public static String Endorsed;
public static String Error_JBossWS_Basic_Editor_Composite;
public static String Error_JBossWS_Basic_Editor_Support;
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java 2008-06-10 05:58:36 UTC (rev 8658)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java 2008-06-10 06:35:14 UTC (rev 8659)
@@ -580,7 +580,15 @@
JbossWSUIMessages.Command };
String jbosswsBinPath = UIUtils.addNodesToPath(jbosswsHomeDir
.getAbsolutePath(), newNode);
- if (new File(jbosswsBinPath).isFile()) {
+ if (new File(jbosswsBinPath).isFile()
+ && new File(UIUtils.addAnotherNodeToPath(jbosswsHomeDir
+ .getAbsolutePath(), JbossWSUIMessages.Client))
+ .isDirectory()
+ && new File(UIUtils
+ .addNodesToPath(jbosswsHomeDir.getAbsolutePath(),
+ new String[] { JbossWSUIMessages.Lib,
+ JbossWSUIMessages.Endorsed }))
+ .isDirectory()) {
return true;
}
return false;
@@ -617,19 +625,19 @@
JbossWSRuntime rt = page1.getRuntime();
added.add(rt);
value.add(rt);
-
+
return true;
}
-
- protected JbossWSRuntime getRuntime(){
+
+ protected JbossWSRuntime getRuntime() {
return page1.getRuntime();
}
-
+
}
/**
- * Wizard for editing JbossWS Runtime parameters: name and path to
- * home folder
+ * Wizard for editing JbossWS Runtime parameters: name and path to home
+ * folder
*
*/
public static class JbossWSRuntimeEditWizard extends Wizard {
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8658 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor: figures and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-06-10 01:58:36 -0400 (Tue, 10 Jun 2008)
New Revision: 8658
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEndpointEditPolicy.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java
Log:
proper hanlding of selection in seam pagse.xml editor
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEndpointEditPolicy.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEndpointEditPolicy.java 2008-06-09 22:49:41 UTC (rev 8657)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEndpointEditPolicy.java 2008-06-10 05:58:36 UTC (rev 8658)
@@ -7,7 +7,7 @@
*
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.seam.ui.pages.editor.edit;
import java.util.ArrayList;
@@ -30,29 +30,30 @@
import org.eclipse.gef.tools.ConnectionEndpointTracker;
import org.jboss.tools.seam.ui.pages.editor.dnd.DndHelper;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link;
+import org.jboss.tools.seam.ui.pages.editor.figures.ConnectionFigure;
import org.jboss.tools.seam.ui.pages.editor.figures.FigureFactory;
public class LinkEndpointEditPolicy
extends org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy {
- private List JSFhandles = null;
+ private List handles = null;
private void addJSFHandles() {
removeJSFHandles();
- JSFhandles = createJSFHandles();
+ handles = createHandles();
IFigure layer = getLayer(LayerConstants.HANDLE_LAYER);
- for (int i = 0; i < JSFhandles.size(); i++)
- layer.add((IFigure) JSFhandles.get(i));
+ for (int i = 0; i < handles.size(); i++)
+ layer.add((IFigure) handles.get(i));
}
private void removeJSFHandles() {
- if (JSFhandles == null)
+ if (handles == null)
return;
IFigure layer = getLayer(LayerConstants.HANDLE_LAYER);
- for (int i = 0; i < JSFhandles.size(); i++)
- layer.remove((IFigure) JSFhandles.get(i));
- JSFhandles = null;
+ for (int i = 0; i < handles.size(); i++)
+ layer.remove((IFigure) handles.get(i));
+ handles = null;
}
protected void addSelectionHandles() {
@@ -60,17 +61,17 @@
super.addSelectionHandles();
addJSFHandles();
- getConnectionFigure().setForegroundColor(FigureFactory.selectedColor);
+ getConnectionFigure().setSelected(true);
}
- protected PolylineConnection getConnectionFigure() {
- return (PolylineConnection) ((GraphicalEditPart) getHost()).getFigure();
+ protected ConnectionFigure getConnectionFigure() {
+ return (ConnectionFigure) ((GraphicalEditPart) getHost()).getFigure();
}
protected void removeSelectionHandles() {
super.removeSelectionHandles();
removeJSFHandles();
- getConnectionFigure().setForegroundColor(FigureFactory.normalColor);
+ getConnectionFigure().setSelected(false);
}
protected List createSelectionHandles() {
@@ -80,7 +81,7 @@
return list;
}
- protected List createJSFHandles() {
+ protected List createHandles() {
List<AbstractHandle> list = new ArrayList<AbstractHandle>();
PolylineConnection conn = getConnectionFigure();
boolean flag = true;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java 2008-06-09 22:49:41 UTC (rev 8657)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java 2008-06-10 05:58:36 UTC (rev 8658)
@@ -7,16 +7,18 @@
*
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.seam.ui.pages.editor.figures;
import org.eclipse.draw2d.AnchorListener;
import org.eclipse.draw2d.Connection;
+import org.eclipse.draw2d.Figure;
import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.PolylineConnection;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.PointList;
+import org.eclipse.swt.graphics.Color;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link;
import org.jboss.tools.seam.ui.pages.editor.edit.LinkEditPart;
@@ -89,8 +91,21 @@
Point beg = new Point(0, 0), end = new Point(0, 0);
Point corner = new Point(0, 0);
boolean horiz;
+ private boolean selected;
+ @Override
+ public void setForegroundColor(Color fg) {
+ // TODO Auto-generated method stub
+ super.setForegroundColor(fg);
+ }
+
protected void outlineShape(Graphics g) {
+
+ if(selected) {
+ g.setForegroundColor(FigureFactory.selectedColor);
+ } else {
+ g.setForegroundColor(getForegroundColor());
+ }
points = getPoints();
point = points.getPoint(0);
beg.x = point.x;
@@ -162,4 +177,9 @@
}
}
+
+ public void setSelected(boolean selected) {
+ this.selected = selected;
+ repaint();
+ }
}
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8657 - trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-06-09 18:49:41 -0400 (Mon, 09 Jun 2008)
New Revision: 8657
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ArchivesMenuHandler.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesView.java
Log:
JBIDE-2319 - again
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ArchivesMenuHandler.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ArchivesMenuHandler.java 2008-06-09 22:49:02 UTC (rev 8656)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ArchivesMenuHandler.java 2008-06-09 22:49:41 UTC (rev 8657)
@@ -34,7 +34,6 @@
import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet;
import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
-import org.jboss.ide.eclipse.archives.core.model.internal.xb.XMLBinding.XbException;
import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages;
import org.jboss.ide.eclipse.archives.ui.ArchivesUIMessages;
import org.jboss.ide.eclipse.archives.ui.ExtensionManager;
@@ -401,17 +400,22 @@
private void deleteSelectedNode () {
IArchiveNode node = getSelectedNode();
if (node != null) {
- IArchiveNode parent = (IArchiveNode) node.getParent();
+ final IArchiveNode parent = (IArchiveNode) node.getParent();
parent.removeChild(node);
- if( parent.getProjectPath() != null ) {
- try {
- ArchivesModel.instance().save(parent.getProjectPath(), new NullProgressMonitor());
- } catch( ArchivesModelException ame ) {
- IStatus status = new Status(IStatus.ERROR, PackagesUIPlugin.PLUGIN_ID, "Problem saving archives model", ame);
- PackagesUIPlugin.getDefault().getLog().log(status);
+ new Job("Delete Archives Node") {
+ protected IStatus run(IProgressMonitor monitor) {
+ if( parent.getProjectPath() != null ) {
+ try {
+ ArchivesModel.instance().save(parent.getProjectPath(), new NullProgressMonitor());
+ } catch( ArchivesModelException ame ) {
+ IStatus status = new Status(IStatus.ERROR, PackagesUIPlugin.PLUGIN_ID, "Problem saving archives model", ame);
+ PackagesUIPlugin.getDefault().getLog().log(status);
+ }
+ }
+ return Status.OK_STATUS;
}
-
- }
+
+ }.schedule();
}
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesView.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesView.java 2008-06-09 22:49:02 UTC (rev 8656)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesView.java 2008-06-09 22:49:41 UTC (rev 8657)
@@ -1,373 +1,373 @@
-package org.jboss.ide.eclipse.archives.ui.views;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.wizard.ProgressMonitorPart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.ui.INullSelectionListener;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.ui.part.ViewPart;
-import org.jboss.ide.eclipse.archives.core.model.ArchivesModel;
-import org.jboss.ide.eclipse.archives.core.model.ArchivesModelCore;
-import org.jboss.ide.eclipse.archives.core.model.ArchivesModelException;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveModelListener;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveModelRootNode;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveNodeDelta;
-import org.jboss.ide.eclipse.archives.ui.ArchivesUIMessages;
-import org.jboss.ide.eclipse.archives.ui.ExtensionManager;
-import org.jboss.ide.eclipse.archives.ui.PackagesUIPlugin;
-import org.jboss.ide.eclipse.archives.ui.PrefsInitializer;
-import org.jboss.ide.eclipse.archives.ui.actions.NewArchiveAction;
-import org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProvider;
-import org.jboss.ide.eclipse.archives.ui.providers.ArchivesLabelProvider;
-
-public class ProjectArchivesView extends ViewPart implements IArchiveModelListener {
-
- protected static ProjectArchivesView instance;
- public static ProjectArchivesView getInstance() {
- return instance;
- }
-
-
- protected ISelectionListener selectionListener;
- public ProjectArchivesView() {
- instance = this;
- selectionListener = createSelectionListener();
- }
-
- public void init(IViewSite site) throws PartInitException {
- super.init(site);
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().addPostSelectionListener(selectionListener);
- ArchivesModel.instance().addModelListener(this);
- }
-
- public void dispose() {
- super.dispose();
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().removePostSelectionListener(selectionListener);
- ArchivesModel.instance().removeModelListener(this);
- }
-
-
- protected ISelectionListener createSelectionListener() {
- return new INullSelectionListener() {
- public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- if (!(selection instanceof IStructuredSelection))
- return;
-
- Object element = ((IStructuredSelection)selection).getFirstElement();
- IProject project = getProject(element);
- if( project != null ) {
- viewSelectionChanged(project);
- } else {
- if( getCurrentProject() != null && !getCurrentProject().exists() ) {
- viewSelectionChanged(null);
- }
- }
- }
-
- public IProject getProject (Object element) {
- if( element instanceof IStructuredSelection)
- element = ((IStructuredSelection)element).getFirstElement();
-
- if (element instanceof IAdaptable) {
- IAdaptable adaptable = (IAdaptable)element;
- IResource resource = (IResource) adaptable.getAdapter(IResource.class);
- if( resource != null )
- return resource.getProject();
- }
- return null;
- }
-
- };
- }
-
-
- // parts
- private PageBook book;
- private IProject project;
- private ArchivesContentProvider contentProvider = new ArchivesContentProvider();
- private ArchivesLabelProvider labelProvider = new ArchivesLabelProvider();
- private Composite emptyComposite, viewerComposite, loadingPackagesComposite, noSelectionComposite;
- private IProgressMonitor loadingProgress;
- private TreeViewer packageViewer;
- private ArchivesMenuHandler menuHandler;
- public void createPartControl(Composite parent) {
- book = new PageBook(parent, SWT.NONE);
- addEmptyComposite(book);
- addLoadingComposite(book);
- addViewerComposite(book);
- addNoSelectionComposite(book);
- book.showPage(noSelectionComposite);
- menuHandler = new ArchivesMenuHandler(packageViewer);
- }
-
- protected void addNoSelectionComposite(PageBook book) {
- noSelectionComposite = new Composite(book, SWT.NONE);
- noSelectionComposite.setLayout(new FillLayout());
- Label label = new Label(noSelectionComposite, SWT.NONE);
- label.setText(ArchivesUIMessages.ProjectPackagesView_noProjectSelectedMessage);
- }
- protected void addEmptyComposite(PageBook book) {
- emptyComposite = new Composite(book, SWT.NONE);
- emptyComposite.setLayout(new FormLayout());
- Label l = new Label(emptyComposite, SWT.NONE);
- l.setText(ArchivesUIMessages.ProjectPackagesView_createPackagesMessage);
-
- Composite actionsComposite = new Composite(emptyComposite, SWT.NONE);
-
-
- FormData lData = new FormData();
- lData.left = new FormAttachment(0,5);
- lData.top = new FormAttachment(0,5);
- l.setLayoutData(lData);
-
- FormData actionsData = new FormData();
- actionsData.left = new FormAttachment(0,5);
- actionsData.top = new FormAttachment(l,5);
- actionsData.bottom = new FormAttachment(100,-5);
-
- actionsComposite.setLayoutData(actionsData);
-
- actionsComposite.setLayout(new GridLayout(1, false));
- addNewPackageActions(actionsComposite);
-
- }
-
-
- private void addNewPackageActions (Composite composite) {
- NewArchiveAction[] actions = ExtensionManager.findNewArchiveActions();
- for (int i = 0; i < actions.length; i++) {
- final NewArchiveAction action = actions[i];
-
- Composite linkComposite = new Composite(composite, SWT.NONE);
- linkComposite.setLayout(createGridLayoutWithNoMargins(2));
- linkComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- new Label(linkComposite, SWT.NONE).setImage(action.getIcon());
-
- Link actionLink = new Link(linkComposite, SWT.NONE);
- actionLink.setText("<a href=\"create\">" + action.getLabel() + "</a>");
- actionLink.addSelectionListener(new SelectionListener () {
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
-
- public void widgetSelected(SelectionEvent e) {
- action.getAction().run(null);
- }
- });
- }
- }
-
- private GridLayout createGridLayoutWithNoMargins (int columns) {
- GridLayout layout = new GridLayout(columns, false);
- layout.marginBottom = layout.marginHeight = layout.marginLeft = 0;
- layout.marginRight = layout.marginTop = layout.marginWidth = 0;
-
- return layout;
- }
-
- protected void addLoadingComposite(PageBook book) {
- loadingPackagesComposite = new Composite(book, SWT.NONE);
- loadingPackagesComposite.setLayout(new RowLayout(SWT.HORIZONTAL));
- loadingProgress = new ProgressMonitorPart(loadingPackagesComposite, null);
-
- }
- protected void addViewerComposite(PageBook book) {
- viewerComposite = new Composite(book, SWT.NONE);
- viewerComposite.setLayout(new FillLayout());
- packageViewer = new TreeViewer(viewerComposite, SWT.NONE);
- packageViewer.setContentProvider(contentProvider);
- packageViewer.setLabelProvider(labelProvider);
- }
-
-
- public void setFocus() {
- }
- public void viewSelectionChanged(IProject project) {
- if( project == null ) {
- this.project = null;
- packageViewer.setInput(null);
- book.showPage(noSelectionComposite);
- return;
- }
-
- IArchiveModelRootNode node = (IArchiveModelRootNode) packageViewer.getInput();
- if (node != null)
- {
- IPath projectPath = node.getProjectPath();
-
- if( project.getLocation().equals(projectPath))
- return;
- }
-
- if( !project.isAccessible() ) {
- book.showPage(noSelectionComposite);
- } else if( ArchivesModelCore.packageFileExists(project.getLocation()) ) {
- if( ArchivesModelCore.projectRegistered(project.getLocation()))
- book.showPage(viewerComposite);
- else {
- this.project = project;
- book.showPage(loadingPackagesComposite);
- if( PrefsInitializer.getBoolean(PrefsInitializer.PREF_SHOW_ALL_PROJECTS, project, true)) {
- registerProjects(getAllProjectsWithPackages(), this.project);
- } else {
- registerProjects(new IProject[] {this.project}, this.project);
- }
- return;
- }
- } else {
- book.showPage(emptyComposite);
- }
-
- this.project = project;
- packageViewer.setInput(ArchivesModel.instance().getRoot(project.getLocation()));
- }
-
- public IProject getCurrentProject() {
- return project;
- }
-
- /**
- * Registers the projects if and only if a file exists already
- * @param projects
- * @param projectToShow
- */
- protected void registerProjects(final IProject[] projects, final IProject projectToShow) {
- getSite().getShell().getDisplay().asyncExec(new Runnable () {
- public void run () {
- for( int i = 0; i < projects.length; i++ ) {
- try {
- ArchivesModel.instance().registerProject(projects[i].getLocation(), loadingProgress);
- } catch( ArchivesModelException ame ) {
- IStatus status = new Status(IStatus.ERROR, PackagesUIPlugin.PLUGIN_ID, ame.getMessage(), ame);
- PackagesUIPlugin.getDefault().getLog().log(status);
- }
- }
- book.showPage(viewerComposite);
- packageViewer.setInput(ArchivesModel.instance().getRoot(projectToShow.getLocation()));
- }
- });
- }
-
- public IProject[] getAllProjectsWithPackages() {
- IProject[] projects2 = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- ArrayList list = new ArrayList();
- for( int i = 0; i < projects2.length; i++ ) {
- if( projects2[i].isAccessible() && ArchivesModelCore.packageFileExists(projects2[i].getLocation())) {
- list.add(projects2[i]);
- }
- }
- return (IProject[]) list.toArray(new IProject[list.size()]);
- }
- public IStructuredSelection getSelection() {
- return (IStructuredSelection)packageViewer.getSelection();
- }
-
-
- public void modelChanged(IArchiveNodeDelta delta) {
- boolean update = true;
- try {
- if( project == null ) return;
- if( delta.getPostNode() == null && delta.getPreNode() == null ) return;
- if( delta.getPreNode() == null ) update = delta.getPostNode().getProjectPath().equals(project.getLocation());
- else if( delta.getPostNode() == null ) update = delta.getPreNode().getProjectPath().equals(project.getLocation());
- else update = delta.getPreNode().getProjectPath().equals(project.getLocation()) || delta.getPostNode().getProjectPath().equals(project);
- } catch( Exception e ) {}
-
- if( !update ) return;
-
- final IArchiveNode[] topChanges;
- if( delta.getKind() == IArchiveNodeDelta.DESCENDENT_CHANGED)
- topChanges = getChanges(delta);
- else if( delta.getKind() == IArchiveNodeDelta.NO_CHANGE)
- topChanges = new IArchiveNode[]{};
- else
- topChanges = new IArchiveNode[]{delta.getPostNode()};
-
- // now go through and refresh them
- getSite().getShell().getDisplay().asyncExec(new Runnable () {
- public void run () {
- for( int i = 0; i < topChanges.length; i++ ) {
- if( topChanges.length == 1 && topChanges[0] instanceof IArchiveModelRootNode) {
- // we have a changed IArchiveModelNode. Something's different
- IArchiveModelRootNode inputModel = (IArchiveModelRootNode) packageViewer.getInput();
- IArchiveModelRootNode newModel = (IArchiveModelRootNode)topChanges[0];
- if( inputModel == null || (inputModel.getProjectPath().equals(newModel.getProjectPath()) && inputModel != newModel)) {
- // they have the same path but are different objects.
- // Model was probably reloaded from disk and could be completely different
- book.showPage(viewerComposite);
- packageViewer.setInput(newModel);
- packageViewer.expandAll();
- return;
- } else {
- packageViewer.refresh();
- return;
- }
- } else {
- // just refresh whatever is the top changed element (archive probably)
- packageViewer.refresh(topChanges[i]);
- packageViewer.expandToLevel(topChanges[i], 1);
- }
- }
- }
- });
-
- }
- protected IArchiveNode[] getChanges(IArchiveNodeDelta delta) {
-
- IArchiveNodeDelta[] children = delta.getAllAffectedChildren();
- ArrayList list = new ArrayList();
- for( int i = 0; i < children.length; i++ ) {
- if( children[i].getKind() == IArchiveNodeDelta.DESCENDENT_CHANGED)
- list.addAll(Arrays.asList(getChanges(children[i])));
- else
- list.add(children[i].getPostNode());
- }
- return (IArchiveNode[]) list.toArray(new IArchiveNode[list.size()]);
- }
-
- public void refreshViewer(final Object node) {
- getSite().getShell().getDisplay().asyncExec(new Runnable () {
- public void run () {
- if( node == null ) {
- Object[] els = packageViewer.getExpandedElements();
- packageViewer.refresh();
- packageViewer.setExpandedElements(els);
- } else {
- packageViewer.refresh(node);
- }
- }
- });
- }
-}
+package org.jboss.ide.eclipse.archives.ui.views;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.wizard.ProgressMonitorPart;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.layout.RowLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
+import org.eclipse.ui.INullSelectionListener;
+import org.eclipse.ui.ISelectionListener;
+import org.eclipse.ui.IViewSite;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.PageBook;
+import org.eclipse.ui.part.ViewPart;
+import org.jboss.ide.eclipse.archives.core.model.ArchivesModel;
+import org.jboss.ide.eclipse.archives.core.model.ArchivesModelCore;
+import org.jboss.ide.eclipse.archives.core.model.ArchivesModelException;
+import org.jboss.ide.eclipse.archives.core.model.IArchiveModelListener;
+import org.jboss.ide.eclipse.archives.core.model.IArchiveModelRootNode;
+import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
+import org.jboss.ide.eclipse.archives.core.model.IArchiveNodeDelta;
+import org.jboss.ide.eclipse.archives.ui.ArchivesUIMessages;
+import org.jboss.ide.eclipse.archives.ui.ExtensionManager;
+import org.jboss.ide.eclipse.archives.ui.PackagesUIPlugin;
+import org.jboss.ide.eclipse.archives.ui.PrefsInitializer;
+import org.jboss.ide.eclipse.archives.ui.actions.NewArchiveAction;
+import org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProvider;
+import org.jboss.ide.eclipse.archives.ui.providers.ArchivesLabelProvider;
+
+public class ProjectArchivesView extends ViewPart implements IArchiveModelListener {
+
+ protected static ProjectArchivesView instance;
+ public static ProjectArchivesView getInstance() {
+ return instance;
+ }
+
+
+ protected ISelectionListener selectionListener;
+ public ProjectArchivesView() {
+ instance = this;
+ selectionListener = createSelectionListener();
+ }
+
+ public void init(IViewSite site) throws PartInitException {
+ super.init(site);
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().addPostSelectionListener(selectionListener);
+ ArchivesModel.instance().addModelListener(this);
+ }
+
+ public void dispose() {
+ super.dispose();
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().removePostSelectionListener(selectionListener);
+ ArchivesModel.instance().removeModelListener(this);
+ }
+
+
+ protected ISelectionListener createSelectionListener() {
+ return new INullSelectionListener() {
+ public void selectionChanged(IWorkbenchPart part, ISelection selection) {
+ if (!(selection instanceof IStructuredSelection))
+ return;
+
+ Object element = ((IStructuredSelection)selection).getFirstElement();
+ IProject project = getProject(element);
+ if( project != null ) {
+ viewSelectionChanged(project);
+ } else {
+ if( getCurrentProject() != null && !getCurrentProject().exists() ) {
+ viewSelectionChanged(null);
+ }
+ }
+ }
+
+ public IProject getProject (Object element) {
+ if( element instanceof IStructuredSelection)
+ element = ((IStructuredSelection)element).getFirstElement();
+
+ if (element instanceof IAdaptable) {
+ IAdaptable adaptable = (IAdaptable)element;
+ IResource resource = (IResource) adaptable.getAdapter(IResource.class);
+ if( resource != null )
+ return resource.getProject();
+ }
+ return null;
+ }
+
+ };
+ }
+
+
+ // parts
+ private PageBook book;
+ private IProject project;
+ private ArchivesContentProvider contentProvider = new ArchivesContentProvider();
+ private ArchivesLabelProvider labelProvider = new ArchivesLabelProvider();
+ private Composite emptyComposite, viewerComposite, loadingPackagesComposite, noSelectionComposite;
+ private IProgressMonitor loadingProgress;
+ private TreeViewer packageViewer;
+ private ArchivesMenuHandler menuHandler;
+ public void createPartControl(Composite parent) {
+ book = new PageBook(parent, SWT.NONE);
+ addEmptyComposite(book);
+ addLoadingComposite(book);
+ addViewerComposite(book);
+ addNoSelectionComposite(book);
+ book.showPage(noSelectionComposite);
+ menuHandler = new ArchivesMenuHandler(packageViewer);
+ }
+
+ protected void addNoSelectionComposite(PageBook book) {
+ noSelectionComposite = new Composite(book, SWT.NONE);
+ noSelectionComposite.setLayout(new FillLayout());
+ Label label = new Label(noSelectionComposite, SWT.NONE);
+ label.setText(ArchivesUIMessages.ProjectPackagesView_noProjectSelectedMessage);
+ }
+ protected void addEmptyComposite(PageBook book) {
+ emptyComposite = new Composite(book, SWT.NONE);
+ emptyComposite.setLayout(new FormLayout());
+ Label l = new Label(emptyComposite, SWT.NONE);
+ l.setText(ArchivesUIMessages.ProjectPackagesView_createPackagesMessage);
+
+ Composite actionsComposite = new Composite(emptyComposite, SWT.NONE);
+
+
+ FormData lData = new FormData();
+ lData.left = new FormAttachment(0,5);
+ lData.top = new FormAttachment(0,5);
+ l.setLayoutData(lData);
+
+ FormData actionsData = new FormData();
+ actionsData.left = new FormAttachment(0,5);
+ actionsData.top = new FormAttachment(l,5);
+ actionsData.bottom = new FormAttachment(100,-5);
+
+ actionsComposite.setLayoutData(actionsData);
+
+ actionsComposite.setLayout(new GridLayout(1, false));
+ addNewPackageActions(actionsComposite);
+
+ }
+
+
+ private void addNewPackageActions (Composite composite) {
+ NewArchiveAction[] actions = ExtensionManager.findNewArchiveActions();
+ for (int i = 0; i < actions.length; i++) {
+ final NewArchiveAction action = actions[i];
+
+ Composite linkComposite = new Composite(composite, SWT.NONE);
+ linkComposite.setLayout(createGridLayoutWithNoMargins(2));
+ linkComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+ new Label(linkComposite, SWT.NONE).setImage(action.getIcon());
+
+ Link actionLink = new Link(linkComposite, SWT.NONE);
+ actionLink.setText("<a href=\"create\">" + action.getLabel() + "</a>");
+ actionLink.addSelectionListener(new SelectionListener () {
+ public void widgetDefaultSelected(SelectionEvent e) {
+ widgetSelected(e);
+ }
+
+ public void widgetSelected(SelectionEvent e) {
+ action.getAction().run(null);
+ }
+ });
+ }
+ }
+
+ private GridLayout createGridLayoutWithNoMargins (int columns) {
+ GridLayout layout = new GridLayout(columns, false);
+ layout.marginBottom = layout.marginHeight = layout.marginLeft = 0;
+ layout.marginRight = layout.marginTop = layout.marginWidth = 0;
+
+ return layout;
+ }
+
+ protected void addLoadingComposite(PageBook book) {
+ loadingPackagesComposite = new Composite(book, SWT.NONE);
+ loadingPackagesComposite.setLayout(new RowLayout(SWT.HORIZONTAL));
+ loadingProgress = new ProgressMonitorPart(loadingPackagesComposite, null);
+
+ }
+ protected void addViewerComposite(PageBook book) {
+ viewerComposite = new Composite(book, SWT.NONE);
+ viewerComposite.setLayout(new FillLayout());
+ packageViewer = new TreeViewer(viewerComposite, SWT.NONE);
+ packageViewer.setContentProvider(contentProvider);
+ packageViewer.setLabelProvider(labelProvider);
+ }
+
+
+ public void setFocus() {
+ }
+ public void viewSelectionChanged(IProject project) {
+ if( project == null ) {
+ this.project = null;
+ packageViewer.setInput(null);
+ book.showPage(noSelectionComposite);
+ return;
+ }
+
+ IArchiveModelRootNode node = (IArchiveModelRootNode) packageViewer.getInput();
+ if (node != null)
+ {
+ IPath projectPath = node.getProjectPath();
+
+ if( project.getLocation().equals(projectPath))
+ return;
+ }
+
+ if( !project.isAccessible() ) {
+ book.showPage(noSelectionComposite);
+ } else if( ArchivesModelCore.packageFileExists(project.getLocation()) ) {
+ if( ArchivesModelCore.projectRegistered(project.getLocation()))
+ book.showPage(viewerComposite);
+ else {
+ this.project = project;
+ book.showPage(loadingPackagesComposite);
+ if( PrefsInitializer.getBoolean(PrefsInitializer.PREF_SHOW_ALL_PROJECTS, project, true)) {
+ registerProjects(getAllProjectsWithPackages(), this.project);
+ } else {
+ registerProjects(new IProject[] {this.project}, this.project);
+ }
+ return;
+ }
+ } else {
+ book.showPage(emptyComposite);
+ }
+
+ this.project = project;
+ packageViewer.setInput(ArchivesModel.instance().getRoot(project.getLocation()));
+ }
+
+ public IProject getCurrentProject() {
+ return project;
+ }
+
+ /**
+ * Registers the projects if and only if a file exists already
+ * @param projects
+ * @param projectToShow
+ */
+ protected void registerProjects(final IProject[] projects, final IProject projectToShow) {
+ for( int i = 0; i < projects.length; i++ ) {
+ try {
+ ArchivesModel.instance().registerProject(projects[i].getLocation(), loadingProgress);
+ } catch( ArchivesModelException ame ) {
+ IStatus status = new Status(IStatus.ERROR, PackagesUIPlugin.PLUGIN_ID, ame.getMessage(), ame);
+ PackagesUIPlugin.getDefault().getLog().log(status);
+ }
+ }
+ getSite().getShell().getDisplay().asyncExec(new Runnable () {
+ public void run () {
+ book.showPage(viewerComposite);
+ packageViewer.setInput(ArchivesModel.instance().getRoot(projectToShow.getLocation()));
+ }
+ });
+ }
+
+ public IProject[] getAllProjectsWithPackages() {
+ IProject[] projects2 = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+ ArrayList list = new ArrayList();
+ for( int i = 0; i < projects2.length; i++ ) {
+ if( projects2[i].isAccessible() && ArchivesModelCore.packageFileExists(projects2[i].getLocation())) {
+ list.add(projects2[i]);
+ }
+ }
+ return (IProject[]) list.toArray(new IProject[list.size()]);
+ }
+ public IStructuredSelection getSelection() {
+ return (IStructuredSelection)packageViewer.getSelection();
+ }
+
+
+ public void modelChanged(IArchiveNodeDelta delta) {
+ boolean update = true;
+ try {
+ if( project == null ) return;
+ if( delta.getPostNode() == null && delta.getPreNode() == null ) return;
+ if( delta.getPreNode() == null ) update = delta.getPostNode().getProjectPath().equals(project.getLocation());
+ else if( delta.getPostNode() == null ) update = delta.getPreNode().getProjectPath().equals(project.getLocation());
+ else update = delta.getPreNode().getProjectPath().equals(project.getLocation()) || delta.getPostNode().getProjectPath().equals(project);
+ } catch( Exception e ) {}
+
+ if( !update ) return;
+
+ final IArchiveNode[] topChanges;
+ if( delta.getKind() == IArchiveNodeDelta.DESCENDENT_CHANGED)
+ topChanges = getChanges(delta);
+ else if( delta.getKind() == IArchiveNodeDelta.NO_CHANGE)
+ topChanges = new IArchiveNode[]{};
+ else
+ topChanges = new IArchiveNode[]{delta.getPostNode()};
+
+ // now go through and refresh them
+ getSite().getShell().getDisplay().asyncExec(new Runnable () {
+ public void run () {
+ for( int i = 0; i < topChanges.length; i++ ) {
+ if( topChanges.length == 1 && topChanges[0] instanceof IArchiveModelRootNode) {
+ // we have a changed IArchiveModelNode. Something's different
+ IArchiveModelRootNode inputModel = (IArchiveModelRootNode) packageViewer.getInput();
+ IArchiveModelRootNode newModel = (IArchiveModelRootNode)topChanges[0];
+ if( inputModel == null || (inputModel.getProjectPath().equals(newModel.getProjectPath()) && inputModel != newModel)) {
+ // they have the same path but are different objects.
+ // Model was probably reloaded from disk and could be completely different
+ book.showPage(viewerComposite);
+ packageViewer.setInput(newModel);
+ packageViewer.expandAll();
+ return;
+ } else {
+ packageViewer.refresh();
+ return;
+ }
+ } else {
+ // just refresh whatever is the top changed element (archive probably)
+ packageViewer.refresh(topChanges[i]);
+ packageViewer.expandToLevel(topChanges[i], 1);
+ }
+ }
+ }
+ });
+
+ }
+ protected IArchiveNode[] getChanges(IArchiveNodeDelta delta) {
+
+ IArchiveNodeDelta[] children = delta.getAllAffectedChildren();
+ ArrayList list = new ArrayList();
+ for( int i = 0; i < children.length; i++ ) {
+ if( children[i].getKind() == IArchiveNodeDelta.DESCENDENT_CHANGED)
+ list.addAll(Arrays.asList(getChanges(children[i])));
+ else
+ list.add(children[i].getPostNode());
+ }
+ return (IArchiveNode[]) list.toArray(new IArchiveNode[list.size()]);
+ }
+
+ public void refreshViewer(final Object node) {
+ getSite().getShell().getDisplay().asyncExec(new Runnable () {
+ public void run () {
+ if( node == null ) {
+ Object[] els = packageViewer.getExpandedElements();
+ packageViewer.refresh();
+ packageViewer.setExpandedElements(els);
+ } else {
+ packageViewer.refresh(node);
+ }
+ }
+ });
+ }
+}
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8656 - in trunk/core: tests/org.jboss.ide.eclipse.archives.test/META-INF and 31 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-06-09 18:49:02 -0400 (Mon, 09 Jun 2008)
New Revision: 8656
Added:
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.classpath
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.packages
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.project
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.jdt.core.prefs
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.jst.common.project.facet.core.prefs
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.wst.common.component
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/META-INF/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/META-INF/jboss-service.xml
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/unified-invoker.war/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/unified-invoker.war/WEB-INF/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/unified-invoker.war/WEB-INF/web.xml
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/META-INF/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/META-INF/jboss-service.xml
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/unified-invoker.war/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/unified-invoker.war/WEB-INF/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/unified-invoker.war/WEB-INF/web.xml
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.classpath
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.packages
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.project
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.jdt.core.prefs
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.jst.common.project.facet.core.prefs
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.ltk.core.refactoring.prefs
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.wst.common.component
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.hibernate.eclipse.console.prefs
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/META-INF/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/META-INF/jboss.xml
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/acme-interceptors-aop.xml
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/roles.properties
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/users.properties
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/acme/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/acme/ejb3/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/acme/ejb3/javax/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/acme/ejb3/javax/interceptors/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/acme/ejb3/javax/interceptors/InvocationLogger.java
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/META-INF/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/META-INF/jboss.xml
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/acme-interceptors-aop.xml
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/roles.properties
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/users.properties
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2099Test.java
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2311Test.java
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
trunk/core/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java
Log:
JBIDE-2311 - NPE's plus tests
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2008-06-09 22:44:04 UTC (rev 8655)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2008-06-09 22:49:02 UTC (rev 8656)
@@ -210,9 +210,10 @@
filesetRelative = inputFiles[i].lastSegment();
else
filesetRelative = inputFiles[i].toOSString().substring(fsLength);
-
String tmp = new Path(filesetRelative).removeLastSegments(1).toString();
File parentFile = new File(fsFile, tmp, ArchiveDetector.NULL);
+ if( parentFile.getEnclArchive() != null )
+ parentFile = new File(fsFile, tmp, ArchiveDetector.DEFAULT);
returnFiles[i] = new File(parentFile, new Path(filesetRelative).lastSegment(), ArchiveDetector.DEFAULT);
}
return returnFiles;
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF 2008-06-09 22:44:04 UTC (rev 8655)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF 2008-06-09 22:49:02 UTC (rev 8656)
@@ -8,6 +8,7 @@
org.junit,
org.jboss.ide.eclipse.archives.core,
org.eclipse.core.resources,
- org.jboss.tools.tests
+ org.jboss.tools.tests,
+ org.jboss.tools.common.test
Eclipse-LazyStart: true
Bundle-ClassPath: archivestest.jar
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.classpath
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.classpath (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.classpath 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_03"/>
+ <classpathentry kind="output" path="output/eclipse"/>
+</classpath>
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.packages
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.packages (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.packages 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<packages>
+ <package name="unified-http-invoker.sar" type="jar" todir="/JBIDE2099/output/dist" exploded="true" inWorkspace="true">
+ <fileset dir="/JBIDE2099/output/eclipse" includes="**" inWorkspace="true" flatten="false">
+ <properties></properties>
+ </fileset>
+ <properties>
+ <property name="org.jboss.ide.eclipse.as.core.packages.ModuleIDPropertyKey" value="1210325615218"></property>
+ </properties>
+ </package>
+ <properties></properties>
+</packages>
\ No newline at end of file
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.project
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.project (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.project 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JBIDE2099</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.ide.eclipse.archives.core.archivesBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.jboss.ide.eclipse.archives.core.archivesNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ </natures>
+</projectDescription>
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.jdt.core.prefs 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,7 @@
+#Fri May 09 11:25:12 CEST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.jst.common.project.facet.core.prefs
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,4 @@
+#Mon Jun 09 14:49:02 EDT 2008
+classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jdk1.6.0_03/owners=jst.java\:5.0
+classpath.helper/org.eclipse.jst.server.core.container\:\:org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget\:\:JBoss\ 4.2\ Runtime/owners=jst.utility\:1.0;\#system\#
+eclipse.preferences.version=1
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.wst.common.component 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="JBIDE2099">
+ <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+ </wb-module>
+</project-modules>
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 4.2 Runtime"/>
+ <fixed facet="jst.java"/>
+ <fixed facet="jst.utility"/>
+ <installed facet="jst.java" version="5.0"/>
+ <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/META-INF/jboss-service.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/META-INF/jboss-service.xml (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/META-INF/jboss-service.xml 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: jboss-service.xml 296 2008-04-18 14:39:28Z galder $ -->
+<server>
+ <!-- Expose the Naming service interface via the UnifiedInvoker -->
+ <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+ name="jboss:service=proxyfactory,type=unified,transport=servlet,target=naming">
+ <attribute name="InvokerName">jboss:service=invoker,type=unified,transport=servlet</attribute>
+ <attribute name="TargetName">jboss:service=Naming</attribute>
+ <attribute name="JndiName"></attribute>
+ <attribute name="ExportedInterface">org.jnp.interfaces.Naming</attribute>
+ <attribute name="ClientInterceptors">
+ <interceptors>
+ <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.naming.interceptors.ExceptionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </interceptors>
+ </attribute>
+ <depends>jboss:service=invoker,type=unified,transport=servlet</depends>
+ </mbean>
+
+ <!-- Expose the Naming service interface via the UnifiedInvoker -->
+ <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+ name="jboss:service=proxyfactory,type=unified,transport=sslservlet,target=naming">
+ <attribute name="InvokerName">jboss:service=invoker,type=unified,transport=sslservlet</attribute>
+ <attribute name="TargetName">jboss:service=Naming</attribute>
+ <attribute name="JndiName"></attribute>
+ <attribute name="ExportedInterface">org.jnp.interfaces.Naming</attribute>
+ <attribute name="ClientInterceptors">
+ <interceptors>
+ <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.naming.interceptors.ExceptionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </interceptors>
+ </attribute>
+ <depends>jboss:service=invoker,type=unified,transport=sslservlet</depends>
+ </mbean>
+
+ <!-- Unified invoker (based on remoting) for invocations via HTTP with target EJB2 beans or JNDI -->
+ <mbean code="org.jboss.invocation.unified.server.UnifiedInvoker"
+ name="jboss:service=invoker,type=unified,transport=servlet">
+ <depends>jboss:service=TransactionManager</depends>
+ <depends>jboss.remoting:service=connector,transport=servlet</depends>
+ </mbean>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=connector,transport=servlet"
+ display-name="Servlet transport Connector">
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="servlet">
+ <attribute name="dataType" isParam="true">invocation</attribute>
+ <attribute name="marshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationMarshaller</attribute>
+ <attribute name="unmarshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationUnMarshaller</attribute>
+ <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
+ <attribute name="serverBindPort">8080</attribute>
+ <attribute name="path">unified-invoker/ServerInvokerServlet</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="invoker">jboss:service=invoker,type=unified,transport=servlet</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+ <!-- Unified invoker (based on remoting) for invocations via HTTPs with target EJB2 beans or JNDI -->
+ <mbean code="org.jboss.invocation.unified.server.UnifiedInvoker"
+ name="jboss:service=invoker,type=unified,transport=sslservlet">
+ <depends>jboss:service=TransactionManager</depends>
+ <depends>jboss.remoting:service=connector,transport=sslservlet</depends>
+ </mbean>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=connector,transport=sslservlet"
+ display-name="SSL Servlet transport Connector">
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="sslservlet">
+ <attribute name="dataType" isParam="true">invocation</attribute>
+ <attribute name="marshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationMarshaller</attribute>
+ <attribute name="unmarshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationUnMarshaller</attribute>
+ <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
+ <attribute name="serverBindPort">8443</attribute>
+ <attribute name="path">unified-invoker/SSLServerInvokerServlet</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="invoker">jboss:service=invoker,type=unified,transport=sslservlet</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+ <!-- Unified invoker (based on remoting) for invocations via HTTP with target EJB3 beans -->
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=connector,transport=servlet,target=ejb3"
+ display-name="EJB3 Servlet transport Connector">
+ <depends>jboss.aop:service=AspectDeployer</depends>
+ <attribute name="InvokerLocator">
+ servlet://${jboss.bind.address}:8080/unified-invoker/Ejb3ServerInvokerServlet
+ </attribute>
+ <attribute name="Configuration">
+ <handlers>
+ <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+ </handlers>
+ </attribute>
+ </mbean>
+
+ <!-- Unified invoker (based on remoting) for invocations via HTTPs with target EJB3 beans -->
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=connector,transport=sslservlet,target=ejb3"
+ display-name="EJB3 Servlet SSL transport Connector">
+ <depends>jboss.aop:service=AspectDeployer</depends>
+ <attribute name="InvokerLocator">
+ sslservlet://${jboss.bind.address}:8443/unified-invoker/SSLEjb3ServerInvokerServlet
+ </attribute>
+ <attribute name="Configuration">
+ <handlers>
+ <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+ </handlers>
+ </attribute>
+ </mbean>
+
+</server>
\ No newline at end of file
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/unified-invoker.war/WEB-INF/web.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/unified-invoker.war/WEB-INF/web.xml (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/unified-invoker.war/WEB-INF/web.xml 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!-- $Id:web.xml 293 2008-04-17 10:29:16Z galder $ -->
+<web-app>
+ <servlet>
+ <servlet-name>ServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTP protocol
+ from within a web container and passes it onto the ServletServerInvoker
+ for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <init-param>
+ <param-name>invokerName</param-name>
+ <param-value>jboss.remoting:service=invoker,transport=servlet</param-value>
+ <description>The servlet server invoker</description>
+ </init-param>
+ <!-- init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>
+ <![CDATA[servlet://${jboss.bind.address}:8080/unified-invoker/ServerInvokerServlet/?dataType=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller]]>
+ </param-value>
+ <description>The servlet server invoker</description>
+ </init-param -->
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>SSLServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTPs protocol
+ from within a web container and passes it onto the ServletServerInvoker
+ for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>
+ <![CDATA[sslservlet://${jboss.bind.address}:8443/unified-invoker/SSLServerInvokerServlet/?dataType=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller]]>
+ </param-value>
+ <description>The servlet server invoker</description>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Ejb3ServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTP
+ protocol from within a web container and passes it onto the
+ ServletServerInvoker for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <!-- Pass locatorUrl instead of invokerName because otherwise you end up
+ sharing the same server invoker for org.jboss.invocation and org.jboss.aop
+ type of invocations which you don't wanna do. Worth noting that invokerName
+ is hardcoded and hence you cannot create a separate one that way, hence the
+ use of locatorUrl. -->
+ <init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>servlet://${jboss.bind.address}:8080/unified-invoker/Ejb3ServerInvokerServlet</param-value>
+ <description>The servlet server invoker</description>
+ </init-param>
+ <!-- init-param>
+ <param-name>invokerName</param-name>
+ <param-value>jboss.remoting:service=invoker,transport=servlet</param-value>
+ <description>The servlet server invoker</description>
+ </init-param -->
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>SSLEjb3ServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTPS
+ protocol from within a web container and passes it onto the
+ ServletServerInvoker for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>sslservlet://${jboss.bind.address}:8443/unified-invoker/SSLEjb3ServerInvokerServlet</param-value>
+ <description>The ssl servlet server invoker locator url</description>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>JNDIFactory</servlet-name>
+ <description>A servlet that exposes the JBoss JNDI Naming service stub
+ through http. The return content is a serialized
+ MarshalledValue containg the org.jnp.interfaces.Naming stub. This
+ configuration handles requests for the standard JNDI naming service.
+ </description>
+ <servlet-class>org.jboss.invocation.http.servlet.NamingFactoryServlet</servlet-class>
+ <init-param>
+ <param-name>namingProxyMBean</param-name>
+ <param-value>jboss:service=proxyfactory,type=unified,transport=servlet,target=naming</param-value>
+ </init-param>
+ <init-param>
+ <param-name>proxyAttribute</param-name>
+ <param-value>Proxy</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>SSLJNDIFactory</servlet-name>
+ <description>A servlet that exposes the JBoss JNDI Naming service stub
+ through http. The return content is a serialized
+ MarshalledValue containg the org.jnp.interfaces.Naming stub. This
+ configuration handles requests for the standard JNDI naming service.
+ </description>
+ <servlet-class>org.jboss.invocation.http.servlet.NamingFactoryServlet</servlet-class>
+ <init-param>
+ <param-name>namingProxyMBean</param-name>
+ <param-value>jboss:service=proxyfactory,type=unified,transport=sslservlet,target=naming</param-value>
+ </init-param>
+ <init-param>
+ <param-name>proxyAttribute</param-name>
+ <param-value>Proxy</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ServerInvokerServlet</servlet-name>
+ <url-pattern>/ServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>SSLServerInvokerServlet</servlet-name>
+ <url-pattern>/SSLServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Ejb3ServerInvokerServlet</servlet-name>
+ <url-pattern>/Ejb3ServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>SSLEjb3ServerInvokerServlet</servlet-name>
+ <url-pattern>/SSLEjb3ServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>JNDIFactory</servlet-name>
+ <url-pattern>/JNDIFactory/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>SSLJNDIFactory</servlet-name>
+ <url-pattern>/SSLJNDIFactory/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/META-INF/jboss-service.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/META-INF/jboss-service.xml (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/META-INF/jboss-service.xml 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: jboss-service.xml 296 2008-04-18 14:39:28Z galder $ -->
+<server>
+ <!-- Expose the Naming service interface via the UnifiedInvoker -->
+ <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+ name="jboss:service=proxyfactory,type=unified,transport=servlet,target=naming">
+ <attribute name="InvokerName">jboss:service=invoker,type=unified,transport=servlet</attribute>
+ <attribute name="TargetName">jboss:service=Naming</attribute>
+ <attribute name="JndiName"></attribute>
+ <attribute name="ExportedInterface">org.jnp.interfaces.Naming</attribute>
+ <attribute name="ClientInterceptors">
+ <interceptors>
+ <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.naming.interceptors.ExceptionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </interceptors>
+ </attribute>
+ <depends>jboss:service=invoker,type=unified,transport=servlet</depends>
+ </mbean>
+
+ <!-- Expose the Naming service interface via the UnifiedInvoker -->
+ <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+ name="jboss:service=proxyfactory,type=unified,transport=sslservlet,target=naming">
+ <attribute name="InvokerName">jboss:service=invoker,type=unified,transport=sslservlet</attribute>
+ <attribute name="TargetName">jboss:service=Naming</attribute>
+ <attribute name="JndiName"></attribute>
+ <attribute name="ExportedInterface">org.jnp.interfaces.Naming</attribute>
+ <attribute name="ClientInterceptors">
+ <interceptors>
+ <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.naming.interceptors.ExceptionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </interceptors>
+ </attribute>
+ <depends>jboss:service=invoker,type=unified,transport=sslservlet</depends>
+ </mbean>
+
+ <!-- Unified invoker (based on remoting) for invocations via HTTP with target EJB2 beans or JNDI -->
+ <mbean code="org.jboss.invocation.unified.server.UnifiedInvoker"
+ name="jboss:service=invoker,type=unified,transport=servlet">
+ <depends>jboss:service=TransactionManager</depends>
+ <depends>jboss.remoting:service=connector,transport=servlet</depends>
+ </mbean>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=connector,transport=servlet"
+ display-name="Servlet transport Connector">
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="servlet">
+ <attribute name="dataType" isParam="true">invocation</attribute>
+ <attribute name="marshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationMarshaller</attribute>
+ <attribute name="unmarshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationUnMarshaller</attribute>
+ <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
+ <attribute name="serverBindPort">8080</attribute>
+ <attribute name="path">unified-invoker/ServerInvokerServlet</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="invoker">jboss:service=invoker,type=unified,transport=servlet</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+ <!-- Unified invoker (based on remoting) for invocations via HTTPs with target EJB2 beans or JNDI -->
+ <mbean code="org.jboss.invocation.unified.server.UnifiedInvoker"
+ name="jboss:service=invoker,type=unified,transport=sslservlet">
+ <depends>jboss:service=TransactionManager</depends>
+ <depends>jboss.remoting:service=connector,transport=sslservlet</depends>
+ </mbean>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=connector,transport=sslservlet"
+ display-name="SSL Servlet transport Connector">
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="sslservlet">
+ <attribute name="dataType" isParam="true">invocation</attribute>
+ <attribute name="marshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationMarshaller</attribute>
+ <attribute name="unmarshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationUnMarshaller</attribute>
+ <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
+ <attribute name="serverBindPort">8443</attribute>
+ <attribute name="path">unified-invoker/SSLServerInvokerServlet</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="invoker">jboss:service=invoker,type=unified,transport=sslservlet</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+ <!-- Unified invoker (based on remoting) for invocations via HTTP with target EJB3 beans -->
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=connector,transport=servlet,target=ejb3"
+ display-name="EJB3 Servlet transport Connector">
+ <depends>jboss.aop:service=AspectDeployer</depends>
+ <attribute name="InvokerLocator">
+ servlet://${jboss.bind.address}:8080/unified-invoker/Ejb3ServerInvokerServlet
+ </attribute>
+ <attribute name="Configuration">
+ <handlers>
+ <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+ </handlers>
+ </attribute>
+ </mbean>
+
+ <!-- Unified invoker (based on remoting) for invocations via HTTPs with target EJB3 beans -->
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=connector,transport=sslservlet,target=ejb3"
+ display-name="EJB3 Servlet SSL transport Connector">
+ <depends>jboss.aop:service=AspectDeployer</depends>
+ <attribute name="InvokerLocator">
+ sslservlet://${jboss.bind.address}:8443/unified-invoker/SSLEjb3ServerInvokerServlet
+ </attribute>
+ <attribute name="Configuration">
+ <handlers>
+ <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+ </handlers>
+ </attribute>
+ </mbean>
+
+</server>
\ No newline at end of file
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/unified-invoker.war/WEB-INF/web.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/unified-invoker.war/WEB-INF/web.xml (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/unified-invoker.war/WEB-INF/web.xml 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!-- $Id:web.xml 293 2008-04-17 10:29:16Z galder $ -->
+<web-app>
+ <servlet>
+ <servlet-name>ServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTP protocol
+ from within a web container and passes it onto the ServletServerInvoker
+ for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <init-param>
+ <param-name>invokerName</param-name>
+ <param-value>jboss.remoting:service=invoker,transport=servlet</param-value>
+ <description>The servlet server invoker</description>
+ </init-param>
+ <!-- init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>
+ <![CDATA[servlet://${jboss.bind.address}:8080/unified-invoker/ServerInvokerServlet/?dataType=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller]]>
+ </param-value>
+ <description>The servlet server invoker</description>
+ </init-param -->
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>SSLServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTPs protocol
+ from within a web container and passes it onto the ServletServerInvoker
+ for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>
+ <![CDATA[sslservlet://${jboss.bind.address}:8443/unified-invoker/SSLServerInvokerServlet/?dataType=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller]]>
+ </param-value>
+ <description>The servlet server invoker</description>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Ejb3ServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTP
+ protocol from within a web container and passes it onto the
+ ServletServerInvoker for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <!-- Pass locatorUrl instead of invokerName because otherwise you end up
+ sharing the same server invoker for org.jboss.invocation and org.jboss.aop
+ type of invocations which you don't wanna do. Worth noting that invokerName
+ is hardcoded and hence you cannot create a separate one that way, hence the
+ use of locatorUrl. -->
+ <init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>servlet://${jboss.bind.address}:8080/unified-invoker/Ejb3ServerInvokerServlet</param-value>
+ <description>The servlet server invoker</description>
+ </init-param>
+ <!-- init-param>
+ <param-name>invokerName</param-name>
+ <param-value>jboss.remoting:service=invoker,transport=servlet</param-value>
+ <description>The servlet server invoker</description>
+ </init-param -->
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>SSLEjb3ServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTPS
+ protocol from within a web container and passes it onto the
+ ServletServerInvoker for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>sslservlet://${jboss.bind.address}:8443/unified-invoker/SSLEjb3ServerInvokerServlet</param-value>
+ <description>The ssl servlet server invoker locator url</description>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>JNDIFactory</servlet-name>
+ <description>A servlet that exposes the JBoss JNDI Naming service stub
+ through http. The return content is a serialized
+ MarshalledValue containg the org.jnp.interfaces.Naming stub. This
+ configuration handles requests for the standard JNDI naming service.
+ </description>
+ <servlet-class>org.jboss.invocation.http.servlet.NamingFactoryServlet</servlet-class>
+ <init-param>
+ <param-name>namingProxyMBean</param-name>
+ <param-value>jboss:service=proxyfactory,type=unified,transport=servlet,target=naming</param-value>
+ </init-param>
+ <init-param>
+ <param-name>proxyAttribute</param-name>
+ <param-value>Proxy</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>SSLJNDIFactory</servlet-name>
+ <description>A servlet that exposes the JBoss JNDI Naming service stub
+ through http. The return content is a serialized
+ MarshalledValue containg the org.jnp.interfaces.Naming stub. This
+ configuration handles requests for the standard JNDI naming service.
+ </description>
+ <servlet-class>org.jboss.invocation.http.servlet.NamingFactoryServlet</servlet-class>
+ <init-param>
+ <param-name>namingProxyMBean</param-name>
+ <param-value>jboss:service=proxyfactory,type=unified,transport=sslservlet,target=naming</param-value>
+ </init-param>
+ <init-param>
+ <param-name>proxyAttribute</param-name>
+ <param-value>Proxy</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ServerInvokerServlet</servlet-name>
+ <url-pattern>/ServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>SSLServerInvokerServlet</servlet-name>
+ <url-pattern>/SSLServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Ejb3ServerInvokerServlet</servlet-name>
+ <url-pattern>/Ejb3ServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>SSLEjb3ServerInvokerServlet</servlet-name>
+ <url-pattern>/SSLEjb3ServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>JNDIFactory</servlet-name>
+ <url-pattern>/JNDIFactory/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>SSLJNDIFactory</servlet-name>
+ <url-pattern>/SSLJNDIFactory/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.classpath
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.classpath (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.classpath 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_03"/>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime"/>
+ <classpathentry kind="output" path="output/eclipse"/>
+</classpath>
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.packages
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.packages (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.packages 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<packages>
+ <package name="acme-ejb3-beans-time.jar" type="org.jboss.ide.eclipse.as.core.packages.ejbPackageType" todir="/JBIDE2311/output/dist" exploded="false" inWorkspace="true">
+ <fileset dir="/JBIDE2311/output/eclipse" includes="**" excludes="**/SystemTimeBean**" inWorkspace="true" flatten="false">
+ <properties></properties>
+ </fileset>
+ <properties>
+ <property name="org.jboss.ide.eclipse.as.core.packages.ModuleIDPropertyKey" value="1212068280907"></property>
+ </properties>
+ </package>
+ <properties></properties>
+</packages>
\ No newline at end of file
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.project
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.project (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.project 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JBIDE2311</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.ide.eclipse.archives.core.archivesBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.jboss.ide.eclipse.archives.core.archivesNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ </natures>
+</projectDescription>
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.jdt.core.prefs 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,7 @@
+#Mon Jun 09 13:54:29 EDT 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.jst.common.project.facet.core.prefs
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,5 @@
+#Mon Jun 09 13:55:44 EDT 2008
+classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jdk1.6.0_03/owners=jst.java\:5.0
+classpath.helper/org.eclipse.jst.server.core.container\:\:org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget\:\:JBoss\ 4.2\ Runtime/owners=jst.ejb\:3.0
+classpath.helper/org.eclipse.jst.server.core.container\:\:org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget\:\:as-5.0.0.cr1-default/owners=\#system\#
+eclipse.preferences.version=1
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.ltk.core.refactoring.prefs
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.ltk.core.refactoring.prefs (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.ltk.core.refactoring.prefs 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,3 @@
+#Mon Apr 21 21:06:48 CEST 2008
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.wst.common.component 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="JBIDE2311">
+ <wb-resource deploy-path="/" source-path="/src/main/java"/>
+ <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+ <property name="java-output-path" value="build/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 4.2 Runtime"/>
+ <installed facet="jst.java" version="5.0"/>
+ <installed facet="jst.ejb" version="3.0"/>
+</faceted-project>
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.hibernate.eclipse.console.prefs
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.hibernate.eclipse.console.prefs (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.hibernate.eclipse.console.prefs 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,4 @@
+#Mon Apr 21 21:06:48 CEST 2008
+default.configuration=
+eclipse.preferences.version=1
+hibernate3.enabled=false
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/META-INF/jboss.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/META-INF/jboss.xml (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/META-INF/jboss.xml 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="3.0">
+ <enterprise-beans>
+ <session>
+ <ejb-name>TimeTellerBean</ejb-name>
+ <remote-binding>
+ <jndi-name>TimeTellerBean/remote</jndi-name>
+ <client-bind-url>
+ socket://${jboss.bind.address}:3873
+ </client-bind-url>
+ </remote-binding>
+ <remote-binding>
+ <jndi-name>TimeTellerBean/http</jndi-name>
+ <client-bind-url>
+ http://${jboss.bind.address}:8080/unified-invoker/Ejb3ServerInvokerServlet
+ </client-bind-url>
+ </remote-binding>
+ <remote-binding>
+ <jndi-name>TimeTellerBean/https</jndi-name>
+ <client-bind-url>
+ https://${jboss.bind.address}:8443/unified-invoker/SSLEjb3ServerInvokerServlet
+ </client-bind-url>
+ </remote-binding>
+ <!-- remote-binding>
+ <jndi-name>OverrideStatefulClusteredSSL</jndi-name>
+ <client-bind-url>sslsocket://0.0.0.0:3843</client-bind-url>
+ </remote-binding>
+ <remote-binding>
+ <jndi-name>OverrideStatefulClusteredNormal</jndi-name>
+ <client-bind-url>socket://0.0.0.0:3873</client-bind-url>
+ </remote-binding -->
+ </session>
+ </enterprise-beans>
+</jboss>
\ No newline at end of file
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/acme-interceptors-aop.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/acme-interceptors-aop.xml (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/acme-interceptors-aop.xml 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE aop PUBLIC
+ "-//JBoss//DTD JBOSS AOP 1.0//EN"
+ "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
+
+<aop>
+ <interceptor class="com.acme.ejb3.jboss.interceptors.RemoteInvocationExceptionLogger" scope="PER_VM"/>
+
+ <domain name="acme-stateless-bean">
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <interceptor-ref name="Basic Authorization"/>
+ </bind>
+ <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
+ <interceptor-ref name="com.acme.ejb3.jboss.interceptors.RemoteInvocationExceptionLogger"/>
+ <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+ </bind>
+ <annotation expr="!class((a)org.jboss.annotation.ejb.PoolClass)">
+ @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
+ </annotation>
+ </domain>
+
+</aop>
\ No newline at end of file
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/roles.properties
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/roles.properties (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/roles.properties 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1 @@
+galder=jboss-seg
\ No newline at end of file
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/users.properties
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/users.properties (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/users.properties 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1 @@
+galder=password
\ No newline at end of file
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/acme/ejb3/javax/interceptors/InvocationLogger.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/acme/ejb3/javax/interceptors/InvocationLogger.java (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/acme/ejb3/javax/interceptors/InvocationLogger.java 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, 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 com.acme.ejb3.javax.interceptors;
+
+import org.jboss.logging.Logger;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import java.util.Arrays;
+
+/**
+ * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a>
+ */
+public class InvocationLogger
+{
+ private static final Logger log = Logger.getLogger(InvocationLogger.class);
+
+ @AroundInvoke
+ public Object log(InvocationContext ctx) throws Exception
+ {
+ String signature = "class=" + ctx.getTarget().getClass() +
+ ", method=" + ctx.getMethod().getName() +
+ ", with parameters=" + Arrays.toString(ctx.getParameters());
+ try
+ {
+ log.info("*** entering " + signature);
+
+ return ctx.proceed();
+ }
+ finally
+ {
+ log.info("*** exiting " + signature);
+ }
+ }
+}
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/META-INF/jboss.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/META-INF/jboss.xml (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/META-INF/jboss.xml 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="3.0">
+ <enterprise-beans>
+ <session>
+ <ejb-name>TimeTellerBean</ejb-name>
+ <remote-binding>
+ <jndi-name>TimeTellerBean/remote</jndi-name>
+ <client-bind-url>
+ socket://${jboss.bind.address}:3873
+ </client-bind-url>
+ </remote-binding>
+ <remote-binding>
+ <jndi-name>TimeTellerBean/http</jndi-name>
+ <client-bind-url>
+ http://${jboss.bind.address}:8080/unified-invoker/Ejb3ServerInvokerServlet
+ </client-bind-url>
+ </remote-binding>
+ <remote-binding>
+ <jndi-name>TimeTellerBean/https</jndi-name>
+ <client-bind-url>
+ https://${jboss.bind.address}:8443/unified-invoker/SSLEjb3ServerInvokerServlet
+ </client-bind-url>
+ </remote-binding>
+ <!-- remote-binding>
+ <jndi-name>OverrideStatefulClusteredSSL</jndi-name>
+ <client-bind-url>sslsocket://0.0.0.0:3843</client-bind-url>
+ </remote-binding>
+ <remote-binding>
+ <jndi-name>OverrideStatefulClusteredNormal</jndi-name>
+ <client-bind-url>socket://0.0.0.0:3873</client-bind-url>
+ </remote-binding -->
+ </session>
+ </enterprise-beans>
+</jboss>
\ No newline at end of file
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/acme-interceptors-aop.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/acme-interceptors-aop.xml (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/acme-interceptors-aop.xml 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE aop PUBLIC
+ "-//JBoss//DTD JBOSS AOP 1.0//EN"
+ "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
+
+<aop>
+ <interceptor class="com.acme.ejb3.jboss.interceptors.RemoteInvocationExceptionLogger" scope="PER_VM"/>
+
+ <domain name="acme-stateless-bean">
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <interceptor-ref name="Basic Authorization"/>
+ </bind>
+ <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
+ <interceptor-ref name="com.acme.ejb3.jboss.interceptors.RemoteInvocationExceptionLogger"/>
+ <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+ </bind>
+ <annotation expr="!class((a)org.jboss.annotation.ejb.PoolClass)">
+ @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
+ </annotation>
+ </domain>
+
+</aop>
\ No newline at end of file
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/roles.properties
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/roles.properties (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/roles.properties 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1 @@
+galder=jboss-seg
\ No newline at end of file
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/users.properties
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/users.properties (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/users.properties 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1 @@
+galder=password
\ No newline at end of file
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2008-06-09 22:44:04 UTC (rev 8655)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2008-06-09 22:49:02 UTC (rev 8656)
@@ -9,6 +9,8 @@
import org.jboss.ide.eclipse.archives.test.model.ModelUtilTest;
import org.jboss.ide.eclipse.archives.test.model.XBMarshallTest;
import org.jboss.ide.eclipse.archives.test.model.XBUnmarshallTest;
+import org.jboss.ide.eclipse.archives.test.projects.JBIDE2099Test;
+import org.jboss.ide.eclipse.archives.test.projects.JBIDE2311Test;
import org.jboss.ide.eclipse.archives.test.util.TruezipUtilTest;
public class ArchivesTestSuite extends TestSuite {
@@ -21,6 +23,11 @@
suite.addTestSuite(ModelUtilTest.class);
suite.addTestSuite(ModelCreationTest.class);
suite.addTestSuite(ModelTruezipBridgeTest.class);
+
+ // jiras
+ suite.addTestSuite(JBIDE2099Test.class);
+ suite.addTestSuite(JBIDE2311Test.class);
+
return suite;
}
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2099Test.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2099Test.java (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2099Test.java 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,41 @@
+package org.jboss.ide.eclipse.archives.test.projects;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate;
+import org.jboss.ide.eclipse.archives.test.ArchivesTest;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+
+public class JBIDE2099Test extends TestCase {
+ private TestProjectProvider provider;
+ private IProject project;
+ private IPath outputWar;
+ protected void setUp() throws Exception {
+ provider = new TestProjectProvider(ArchivesTest.PLUGIN_ID,
+ "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2099",
+ null, true);
+ project = provider.getProject();
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ outputWar = project.getLocation().append("output").append("dist")
+ .append("unified-http-invoker.sar").append("unified-invoker.war");
+ }
+
+ protected void tearDown() throws Exception {
+ provider.dispose();
+ }
+
+ public void testJBIDE2099() {
+ ArchiveBuildDelegate delegate = new ArchiveBuildDelegate();
+ try {
+ delegate.fullProjectBuild(project.getLocation());
+ assertTrue(outputWar.toFile().isDirectory());
+ } catch( RuntimeException re ) {
+ fail();
+ }
+ }
+}
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2311Test.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2311Test.java (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2311Test.java 2008-06-09 22:49:02 UTC (rev 8656)
@@ -0,0 +1,37 @@
+package org.jboss.ide.eclipse.archives.test.projects;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate;
+import org.jboss.ide.eclipse.archives.test.ArchivesTest;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+
+public class JBIDE2311Test extends TestCase {
+ private TestProjectProvider provider;
+ private IProject project;
+
+ protected void setUp() throws Exception {
+ provider = new TestProjectProvider(ArchivesTest.PLUGIN_ID,
+ "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2311",
+ null, true);
+ project = provider.getProject();
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ }
+
+ protected void tearDown() throws Exception {
+ provider.dispose();
+ }
+
+ public void testJBIDE2311() {
+ ArchiveBuildDelegate delegate = new ArchiveBuildDelegate();
+ try {
+ delegate.fullProjectBuild(project.getLocation());
+ } catch( RuntimeException re ) {
+ fail();
+ }
+ }
+}
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8655 - branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-06-09 18:44:04 -0400 (Mon, 09 Jun 2008)
New Revision: 8655
Modified:
branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ArchivesMenuHandler.java
branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesView.java
Log:
JBIDE-2319 - build events occurring from UI thread
Modified: branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ArchivesMenuHandler.java
===================================================================
--- branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ArchivesMenuHandler.java 2008-06-09 22:40:39 UTC (rev 8654)
+++ branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ArchivesMenuHandler.java 2008-06-09 22:44:04 UTC (rev 8655)
@@ -34,7 +34,6 @@
import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet;
import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
-import org.jboss.ide.eclipse.archives.core.model.internal.xb.XMLBinding.XbException;
import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages;
import org.jboss.ide.eclipse.archives.ui.ArchivesUIMessages;
import org.jboss.ide.eclipse.archives.ui.ExtensionManager;
@@ -389,17 +388,22 @@
private void deleteSelectedNode () {
IArchiveNode node = getSelectedNode();
if (node != null) {
- IArchiveNode parent = (IArchiveNode) node.getParent();
+ final IArchiveNode parent = (IArchiveNode) node.getParent();
parent.removeChild(node);
- if( parent.getProjectPath() != null ) {
- try {
- ArchivesModel.instance().save(parent.getProjectPath(), new NullProgressMonitor());
- } catch( ArchivesModelException ame ) {
- IStatus status = new Status(IStatus.ERROR, PackagesUIPlugin.PLUGIN_ID, "Problem saving archives model", ame);
- PackagesUIPlugin.getDefault().getLog().log(status);
+ new Job("Delete Archives Node") {
+ protected IStatus run(IProgressMonitor monitor) {
+ if( parent.getProjectPath() != null ) {
+ try {
+ ArchivesModel.instance().save(parent.getProjectPath(), new NullProgressMonitor());
+ } catch( ArchivesModelException ame ) {
+ IStatus status = new Status(IStatus.ERROR, PackagesUIPlugin.PLUGIN_ID, "Problem saving archives model", ame);
+ PackagesUIPlugin.getDefault().getLog().log(status);
+ }
+ }
+ return Status.OK_STATUS;
}
-
- }
+
+ }.schedule();
}
}
Modified: branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesView.java
===================================================================
--- branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesView.java 2008-06-09 22:40:39 UTC (rev 8654)
+++ branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesView.java 2008-06-09 22:44:04 UTC (rev 8655)
@@ -264,16 +264,16 @@
* @param projectToShow
*/
protected void registerProjects(final IProject[] projects, final IProject projectToShow) {
+ for( int i = 0; i < projects.length; i++ ) {
+ try {
+ ArchivesModel.instance().registerProject(projects[i].getLocation(), loadingProgress);
+ } catch( ArchivesModelException ame ) {
+ IStatus status = new Status(IStatus.ERROR, PackagesUIPlugin.PLUGIN_ID, ame.getMessage(), ame);
+ PackagesUIPlugin.getDefault().getLog().log(status);
+ }
+ }
getSite().getShell().getDisplay().asyncExec(new Runnable () {
public void run () {
- for( int i = 0; i < projects.length; i++ ) {
- try {
- ArchivesModel.instance().registerProject(projects[i].getLocation(), loadingProgress);
- } catch( ArchivesModelException ame ) {
- IStatus status = new Status(IStatus.ERROR, PackagesUIPlugin.PLUGIN_ID, ame.getMessage(), ame);
- PackagesUIPlugin.getDefault().getLog().log(status);
- }
- }
book.showPage(viewerComposite);
packageViewer.setInput(ArchivesModel.instance().getRoot(projectToShow.getLocation()));
}
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8654 - in branches/jbosstools-2.1.x/core: plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal and 38 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-06-09 18:40:39 -0400 (Mon, 09 Jun 2008)
New Revision: 8654
Added:
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.classpath
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.packages
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.project
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.jdt.core.prefs
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.jst.common.project.facet.core.prefs
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.wst.common.component
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.wst.common.project.facet.core.xml
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/dist/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/META-INF/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/META-INF/jboss-service.xml
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/unified-invoker.war/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/unified-invoker.war/WEB-INF/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/unified-invoker.war/WEB-INF/web.xml
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/java/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/META-INF/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/META-INF/jboss-service.xml
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/unified-invoker.war/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/unified-invoker.war/WEB-INF/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/unified-invoker.war/WEB-INF/web.xml
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/test/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/test/java/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/test/resources/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.classpath
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.packages
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.project
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.jdt.core.prefs
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.jst.common.project.facet.core.prefs
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.ltk.core.refactoring.prefs
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.wst.common.component
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.wst.common.project.facet.core.xml
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.hibernate.eclipse.console.prefs
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/dist/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/META-INF/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/META-INF/jboss.xml
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/acme-interceptors-aop.xml
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/com/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/com/acme/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/com/acme/ejb3/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/com/acme/ejb3/javax/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/com/acme/ejb3/javax/interceptors/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/com/acme/ejb3/javax/interceptors/InvocationLogger.class
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/roles.properties
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/users.properties
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/acme/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/acme/ejb3/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/acme/ejb3/javax/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/acme/ejb3/javax/interceptors/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/acme/ejb3/javax/interceptors/InvocationLogger.java
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/META-INF/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/META-INF/jboss.xml
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/acme-interceptors-aop.xml
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/roles.properties
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/users.properties
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2099Test.java
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2311Test.java
Modified:
branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.core/.classpath
branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java
Log:
JBIDE-2311 plus tests
Modified: branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.core/.classpath
===================================================================
--- branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.core/.classpath 2008-06-09 21:58:44 UTC (rev 8653)
+++ branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.core/.classpath 2008-06-09 22:40:39 UTC (rev 8654)
@@ -3,7 +3,7 @@
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="src" path="src/xml"/>
<classpathentry kind="src" path="src/eclipse"/>
- <classpathentry exported="true" kind="lib" path="lib/truezip-6.6.jar" sourcepath="/home/rob/Desktop/truezip-6-src.zip"/>
+ <classpathentry exported="true" kind="lib" path="lib/truezip-6.6.jar" sourcepath="/home/rob/code/truezip/truezip/src"/>
<classpathentry exported="true" kind="lib" path="lib/jboss-common-core-2.2.1.GA.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jboss-common-logging-log4j-2.0.4.GA.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jboss-common-logging-spi-2.0.4.GA.jar"/>
Modified: branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
===================================================================
--- branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2008-06-09 21:58:44 UTC (rev 8653)
+++ branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2008-06-09 22:40:39 UTC (rev 8654)
@@ -210,9 +210,10 @@
filesetRelative = inputFiles[i].lastSegment();
else
filesetRelative = inputFiles[i].toOSString().substring(fsLength);
-
String tmp = new Path(filesetRelative).removeLastSegments(1).toString();
File parentFile = new File(fsFile, tmp, ArchiveDetector.NULL);
+ if( parentFile.getEnclArchive() != null )
+ parentFile = new File(fsFile, tmp, ArchiveDetector.DEFAULT);
returnFiles[i] = new File(parentFile, new Path(filesetRelative).lastSegment(), ArchiveDetector.DEFAULT);
}
return returnFiles;
Modified: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF 2008-06-09 21:58:44 UTC (rev 8653)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF 2008-06-09 22:40:39 UTC (rev 8654)
@@ -8,6 +8,7 @@
org.junit,
org.jboss.ide.eclipse.archives.core,
org.eclipse.core.resources,
- org.jboss.tools.tests
+ org.jboss.tools.tests,
+ org.jboss.tools.common.test
Eclipse-LazyStart: true
Bundle-ClassPath: archivestest.jar
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.classpath
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.classpath (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.classpath 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_03"/>
+ <classpathentry kind="output" path="output/eclipse"/>
+</classpath>
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.packages
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.packages (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.packages 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<packages>
+ <package name="unified-http-invoker.sar" type="jar" todir="/JBIDE2099/output/dist" exploded="true" inWorkspace="true">
+ <fileset dir="/JBIDE2099/output/eclipse" includes="**" inWorkspace="true" flatten="false">
+ <properties></properties>
+ </fileset>
+ <properties>
+ <property name="org.jboss.ide.eclipse.as.core.packages.ModuleIDPropertyKey" value="1210325615218"></property>
+ </properties>
+ </package>
+ <properties></properties>
+</packages>
\ No newline at end of file
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.project
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.project (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.project 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JBIDE2099</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.ide.eclipse.archives.core.archivesBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.jboss.ide.eclipse.archives.core.archivesNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ </natures>
+</projectDescription>
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.jdt.core.prefs 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,7 @@
+#Fri May 09 11:25:12 CEST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.jst.common.project.facet.core.prefs
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,4 @@
+#Mon Jun 09 14:49:02 EDT 2008
+classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jdk1.6.0_03/owners=jst.java\:5.0
+classpath.helper/org.eclipse.jst.server.core.container\:\:org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget\:\:JBoss\ 4.2\ Runtime/owners=jst.utility\:1.0;\#system\#
+eclipse.preferences.version=1
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.wst.common.component
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.wst.common.component (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.wst.common.component 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="JBIDE2099">
+ <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+ </wb-module>
+</project-modules>
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 4.2 Runtime"/>
+ <fixed facet="jst.java"/>
+ <fixed facet="jst.utility"/>
+ <installed facet="jst.java" version="5.0"/>
+ <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/META-INF/jboss-service.xml
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/META-INF/jboss-service.xml (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/META-INF/jboss-service.xml 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: jboss-service.xml 296 2008-04-18 14:39:28Z galder $ -->
+<server>
+ <!-- Expose the Naming service interface via the UnifiedInvoker -->
+ <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+ name="jboss:service=proxyfactory,type=unified,transport=servlet,target=naming">
+ <attribute name="InvokerName">jboss:service=invoker,type=unified,transport=servlet</attribute>
+ <attribute name="TargetName">jboss:service=Naming</attribute>
+ <attribute name="JndiName"></attribute>
+ <attribute name="ExportedInterface">org.jnp.interfaces.Naming</attribute>
+ <attribute name="ClientInterceptors">
+ <interceptors>
+ <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.naming.interceptors.ExceptionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </interceptors>
+ </attribute>
+ <depends>jboss:service=invoker,type=unified,transport=servlet</depends>
+ </mbean>
+
+ <!-- Expose the Naming service interface via the UnifiedInvoker -->
+ <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+ name="jboss:service=proxyfactory,type=unified,transport=sslservlet,target=naming">
+ <attribute name="InvokerName">jboss:service=invoker,type=unified,transport=sslservlet</attribute>
+ <attribute name="TargetName">jboss:service=Naming</attribute>
+ <attribute name="JndiName"></attribute>
+ <attribute name="ExportedInterface">org.jnp.interfaces.Naming</attribute>
+ <attribute name="ClientInterceptors">
+ <interceptors>
+ <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.naming.interceptors.ExceptionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </interceptors>
+ </attribute>
+ <depends>jboss:service=invoker,type=unified,transport=sslservlet</depends>
+ </mbean>
+
+ <!-- Unified invoker (based on remoting) for invocations via HTTP with target EJB2 beans or JNDI -->
+ <mbean code="org.jboss.invocation.unified.server.UnifiedInvoker"
+ name="jboss:service=invoker,type=unified,transport=servlet">
+ <depends>jboss:service=TransactionManager</depends>
+ <depends>jboss.remoting:service=connector,transport=servlet</depends>
+ </mbean>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=connector,transport=servlet"
+ display-name="Servlet transport Connector">
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="servlet">
+ <attribute name="dataType" isParam="true">invocation</attribute>
+ <attribute name="marshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationMarshaller</attribute>
+ <attribute name="unmarshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationUnMarshaller</attribute>
+ <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
+ <attribute name="serverBindPort">8080</attribute>
+ <attribute name="path">unified-invoker/ServerInvokerServlet</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="invoker">jboss:service=invoker,type=unified,transport=servlet</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+ <!-- Unified invoker (based on remoting) for invocations via HTTPs with target EJB2 beans or JNDI -->
+ <mbean code="org.jboss.invocation.unified.server.UnifiedInvoker"
+ name="jboss:service=invoker,type=unified,transport=sslservlet">
+ <depends>jboss:service=TransactionManager</depends>
+ <depends>jboss.remoting:service=connector,transport=sslservlet</depends>
+ </mbean>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=connector,transport=sslservlet"
+ display-name="SSL Servlet transport Connector">
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="sslservlet">
+ <attribute name="dataType" isParam="true">invocation</attribute>
+ <attribute name="marshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationMarshaller</attribute>
+ <attribute name="unmarshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationUnMarshaller</attribute>
+ <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
+ <attribute name="serverBindPort">8443</attribute>
+ <attribute name="path">unified-invoker/SSLServerInvokerServlet</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="invoker">jboss:service=invoker,type=unified,transport=sslservlet</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+ <!-- Unified invoker (based on remoting) for invocations via HTTP with target EJB3 beans -->
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=connector,transport=servlet,target=ejb3"
+ display-name="EJB3 Servlet transport Connector">
+ <depends>jboss.aop:service=AspectDeployer</depends>
+ <attribute name="InvokerLocator">
+ servlet://${jboss.bind.address}:8080/unified-invoker/Ejb3ServerInvokerServlet
+ </attribute>
+ <attribute name="Configuration">
+ <handlers>
+ <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+ </handlers>
+ </attribute>
+ </mbean>
+
+ <!-- Unified invoker (based on remoting) for invocations via HTTPs with target EJB3 beans -->
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=connector,transport=sslservlet,target=ejb3"
+ display-name="EJB3 Servlet SSL transport Connector">
+ <depends>jboss.aop:service=AspectDeployer</depends>
+ <attribute name="InvokerLocator">
+ sslservlet://${jboss.bind.address}:8443/unified-invoker/SSLEjb3ServerInvokerServlet
+ </attribute>
+ <attribute name="Configuration">
+ <handlers>
+ <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+ </handlers>
+ </attribute>
+ </mbean>
+
+</server>
\ No newline at end of file
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/unified-invoker.war/WEB-INF/web.xml
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/unified-invoker.war/WEB-INF/web.xml (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/output/eclipse/unified-invoker.war/WEB-INF/web.xml 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!-- $Id:web.xml 293 2008-04-17 10:29:16Z galder $ -->
+<web-app>
+ <servlet>
+ <servlet-name>ServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTP protocol
+ from within a web container and passes it onto the ServletServerInvoker
+ for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <init-param>
+ <param-name>invokerName</param-name>
+ <param-value>jboss.remoting:service=invoker,transport=servlet</param-value>
+ <description>The servlet server invoker</description>
+ </init-param>
+ <!-- init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>
+ <![CDATA[servlet://${jboss.bind.address}:8080/unified-invoker/ServerInvokerServlet/?dataType=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller]]>
+ </param-value>
+ <description>The servlet server invoker</description>
+ </init-param -->
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>SSLServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTPs protocol
+ from within a web container and passes it onto the ServletServerInvoker
+ for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>
+ <![CDATA[sslservlet://${jboss.bind.address}:8443/unified-invoker/SSLServerInvokerServlet/?dataType=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller]]>
+ </param-value>
+ <description>The servlet server invoker</description>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Ejb3ServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTP
+ protocol from within a web container and passes it onto the
+ ServletServerInvoker for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <!-- Pass locatorUrl instead of invokerName because otherwise you end up
+ sharing the same server invoker for org.jboss.invocation and org.jboss.aop
+ type of invocations which you don't wanna do. Worth noting that invokerName
+ is hardcoded and hence you cannot create a separate one that way, hence the
+ use of locatorUrl. -->
+ <init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>servlet://${jboss.bind.address}:8080/unified-invoker/Ejb3ServerInvokerServlet</param-value>
+ <description>The servlet server invoker</description>
+ </init-param>
+ <!-- init-param>
+ <param-name>invokerName</param-name>
+ <param-value>jboss.remoting:service=invoker,transport=servlet</param-value>
+ <description>The servlet server invoker</description>
+ </init-param -->
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>SSLEjb3ServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTPS
+ protocol from within a web container and passes it onto the
+ ServletServerInvoker for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>sslservlet://${jboss.bind.address}:8443/unified-invoker/SSLEjb3ServerInvokerServlet</param-value>
+ <description>The ssl servlet server invoker locator url</description>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>JNDIFactory</servlet-name>
+ <description>A servlet that exposes the JBoss JNDI Naming service stub
+ through http. The return content is a serialized
+ MarshalledValue containg the org.jnp.interfaces.Naming stub. This
+ configuration handles requests for the standard JNDI naming service.
+ </description>
+ <servlet-class>org.jboss.invocation.http.servlet.NamingFactoryServlet</servlet-class>
+ <init-param>
+ <param-name>namingProxyMBean</param-name>
+ <param-value>jboss:service=proxyfactory,type=unified,transport=servlet,target=naming</param-value>
+ </init-param>
+ <init-param>
+ <param-name>proxyAttribute</param-name>
+ <param-value>Proxy</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>SSLJNDIFactory</servlet-name>
+ <description>A servlet that exposes the JBoss JNDI Naming service stub
+ through http. The return content is a serialized
+ MarshalledValue containg the org.jnp.interfaces.Naming stub. This
+ configuration handles requests for the standard JNDI naming service.
+ </description>
+ <servlet-class>org.jboss.invocation.http.servlet.NamingFactoryServlet</servlet-class>
+ <init-param>
+ <param-name>namingProxyMBean</param-name>
+ <param-value>jboss:service=proxyfactory,type=unified,transport=sslservlet,target=naming</param-value>
+ </init-param>
+ <init-param>
+ <param-name>proxyAttribute</param-name>
+ <param-value>Proxy</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ServerInvokerServlet</servlet-name>
+ <url-pattern>/ServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>SSLServerInvokerServlet</servlet-name>
+ <url-pattern>/SSLServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Ejb3ServerInvokerServlet</servlet-name>
+ <url-pattern>/Ejb3ServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>SSLEjb3ServerInvokerServlet</servlet-name>
+ <url-pattern>/SSLEjb3ServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>JNDIFactory</servlet-name>
+ <url-pattern>/JNDIFactory/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>SSLJNDIFactory</servlet-name>
+ <url-pattern>/SSLJNDIFactory/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/META-INF/jboss-service.xml
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/META-INF/jboss-service.xml (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/META-INF/jboss-service.xml 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: jboss-service.xml 296 2008-04-18 14:39:28Z galder $ -->
+<server>
+ <!-- Expose the Naming service interface via the UnifiedInvoker -->
+ <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+ name="jboss:service=proxyfactory,type=unified,transport=servlet,target=naming">
+ <attribute name="InvokerName">jboss:service=invoker,type=unified,transport=servlet</attribute>
+ <attribute name="TargetName">jboss:service=Naming</attribute>
+ <attribute name="JndiName"></attribute>
+ <attribute name="ExportedInterface">org.jnp.interfaces.Naming</attribute>
+ <attribute name="ClientInterceptors">
+ <interceptors>
+ <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.naming.interceptors.ExceptionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </interceptors>
+ </attribute>
+ <depends>jboss:service=invoker,type=unified,transport=servlet</depends>
+ </mbean>
+
+ <!-- Expose the Naming service interface via the UnifiedInvoker -->
+ <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+ name="jboss:service=proxyfactory,type=unified,transport=sslservlet,target=naming">
+ <attribute name="InvokerName">jboss:service=invoker,type=unified,transport=sslservlet</attribute>
+ <attribute name="TargetName">jboss:service=Naming</attribute>
+ <attribute name="JndiName"></attribute>
+ <attribute name="ExportedInterface">org.jnp.interfaces.Naming</attribute>
+ <attribute name="ClientInterceptors">
+ <interceptors>
+ <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.naming.interceptors.ExceptionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </interceptors>
+ </attribute>
+ <depends>jboss:service=invoker,type=unified,transport=sslservlet</depends>
+ </mbean>
+
+ <!-- Unified invoker (based on remoting) for invocations via HTTP with target EJB2 beans or JNDI -->
+ <mbean code="org.jboss.invocation.unified.server.UnifiedInvoker"
+ name="jboss:service=invoker,type=unified,transport=servlet">
+ <depends>jboss:service=TransactionManager</depends>
+ <depends>jboss.remoting:service=connector,transport=servlet</depends>
+ </mbean>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=connector,transport=servlet"
+ display-name="Servlet transport Connector">
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="servlet">
+ <attribute name="dataType" isParam="true">invocation</attribute>
+ <attribute name="marshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationMarshaller</attribute>
+ <attribute name="unmarshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationUnMarshaller</attribute>
+ <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
+ <attribute name="serverBindPort">8080</attribute>
+ <attribute name="path">unified-invoker/ServerInvokerServlet</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="invoker">jboss:service=invoker,type=unified,transport=servlet</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+ <!-- Unified invoker (based on remoting) for invocations via HTTPs with target EJB2 beans or JNDI -->
+ <mbean code="org.jboss.invocation.unified.server.UnifiedInvoker"
+ name="jboss:service=invoker,type=unified,transport=sslservlet">
+ <depends>jboss:service=TransactionManager</depends>
+ <depends>jboss.remoting:service=connector,transport=sslservlet</depends>
+ </mbean>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=connector,transport=sslservlet"
+ display-name="SSL Servlet transport Connector">
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="sslservlet">
+ <attribute name="dataType" isParam="true">invocation</attribute>
+ <attribute name="marshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationMarshaller</attribute>
+ <attribute name="unmarshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationUnMarshaller</attribute>
+ <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
+ <attribute name="serverBindPort">8443</attribute>
+ <attribute name="path">unified-invoker/SSLServerInvokerServlet</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="invoker">jboss:service=invoker,type=unified,transport=sslservlet</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+ <!-- Unified invoker (based on remoting) for invocations via HTTP with target EJB3 beans -->
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=connector,transport=servlet,target=ejb3"
+ display-name="EJB3 Servlet transport Connector">
+ <depends>jboss.aop:service=AspectDeployer</depends>
+ <attribute name="InvokerLocator">
+ servlet://${jboss.bind.address}:8080/unified-invoker/Ejb3ServerInvokerServlet
+ </attribute>
+ <attribute name="Configuration">
+ <handlers>
+ <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+ </handlers>
+ </attribute>
+ </mbean>
+
+ <!-- Unified invoker (based on remoting) for invocations via HTTPs with target EJB3 beans -->
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.remoting:service=connector,transport=sslservlet,target=ejb3"
+ display-name="EJB3 Servlet SSL transport Connector">
+ <depends>jboss.aop:service=AspectDeployer</depends>
+ <attribute name="InvokerLocator">
+ sslservlet://${jboss.bind.address}:8443/unified-invoker/SSLEjb3ServerInvokerServlet
+ </attribute>
+ <attribute name="Configuration">
+ <handlers>
+ <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+ </handlers>
+ </attribute>
+ </mbean>
+
+</server>
\ No newline at end of file
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/unified-invoker.war/WEB-INF/web.xml
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/unified-invoker.war/WEB-INF/web.xml (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2099/src/main/resources/unified-invoker.war/WEB-INF/web.xml 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!-- $Id:web.xml 293 2008-04-17 10:29:16Z galder $ -->
+<web-app>
+ <servlet>
+ <servlet-name>ServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTP protocol
+ from within a web container and passes it onto the ServletServerInvoker
+ for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <init-param>
+ <param-name>invokerName</param-name>
+ <param-value>jboss.remoting:service=invoker,transport=servlet</param-value>
+ <description>The servlet server invoker</description>
+ </init-param>
+ <!-- init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>
+ <![CDATA[servlet://${jboss.bind.address}:8080/unified-invoker/ServerInvokerServlet/?dataType=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller]]>
+ </param-value>
+ <description>The servlet server invoker</description>
+ </init-param -->
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>SSLServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTPs protocol
+ from within a web container and passes it onto the ServletServerInvoker
+ for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>
+ <![CDATA[sslservlet://${jboss.bind.address}:8443/unified-invoker/SSLServerInvokerServlet/?dataType=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller]]>
+ </param-value>
+ <description>The servlet server invoker</description>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Ejb3ServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTP
+ protocol from within a web container and passes it onto the
+ ServletServerInvoker for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <!-- Pass locatorUrl instead of invokerName because otherwise you end up
+ sharing the same server invoker for org.jboss.invocation and org.jboss.aop
+ type of invocations which you don't wanna do. Worth noting that invokerName
+ is hardcoded and hence you cannot create a separate one that way, hence the
+ use of locatorUrl. -->
+ <init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>servlet://${jboss.bind.address}:8080/unified-invoker/Ejb3ServerInvokerServlet</param-value>
+ <description>The servlet server invoker</description>
+ </init-param>
+ <!-- init-param>
+ <param-name>invokerName</param-name>
+ <param-value>jboss.remoting:service=invoker,transport=servlet</param-value>
+ <description>The servlet server invoker</description>
+ </init-param -->
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>SSLEjb3ServerInvokerServlet</servlet-name>
+ <description>The ServerInvokerServlet receives requests via HTTPS
+ protocol from within a web container and passes it onto the
+ ServletServerInvoker for processing.
+ </description>
+ <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+ <init-param>
+ <param-name>locatorUrl</param-name>
+ <param-value>sslservlet://${jboss.bind.address}:8443/unified-invoker/SSLEjb3ServerInvokerServlet</param-value>
+ <description>The ssl servlet server invoker locator url</description>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>JNDIFactory</servlet-name>
+ <description>A servlet that exposes the JBoss JNDI Naming service stub
+ through http. The return content is a serialized
+ MarshalledValue containg the org.jnp.interfaces.Naming stub. This
+ configuration handles requests for the standard JNDI naming service.
+ </description>
+ <servlet-class>org.jboss.invocation.http.servlet.NamingFactoryServlet</servlet-class>
+ <init-param>
+ <param-name>namingProxyMBean</param-name>
+ <param-value>jboss:service=proxyfactory,type=unified,transport=servlet,target=naming</param-value>
+ </init-param>
+ <init-param>
+ <param-name>proxyAttribute</param-name>
+ <param-value>Proxy</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>SSLJNDIFactory</servlet-name>
+ <description>A servlet that exposes the JBoss JNDI Naming service stub
+ through http. The return content is a serialized
+ MarshalledValue containg the org.jnp.interfaces.Naming stub. This
+ configuration handles requests for the standard JNDI naming service.
+ </description>
+ <servlet-class>org.jboss.invocation.http.servlet.NamingFactoryServlet</servlet-class>
+ <init-param>
+ <param-name>namingProxyMBean</param-name>
+ <param-value>jboss:service=proxyfactory,type=unified,transport=sslservlet,target=naming</param-value>
+ </init-param>
+ <init-param>
+ <param-name>proxyAttribute</param-name>
+ <param-value>Proxy</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ServerInvokerServlet</servlet-name>
+ <url-pattern>/ServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>SSLServerInvokerServlet</servlet-name>
+ <url-pattern>/SSLServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Ejb3ServerInvokerServlet</servlet-name>
+ <url-pattern>/Ejb3ServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>SSLEjb3ServerInvokerServlet</servlet-name>
+ <url-pattern>/SSLEjb3ServerInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>JNDIFactory</servlet-name>
+ <url-pattern>/JNDIFactory/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>SSLJNDIFactory</servlet-name>
+ <url-pattern>/SSLJNDIFactory/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.classpath
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.classpath (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.classpath 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_03"/>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime"/>
+ <classpathentry kind="output" path="output/eclipse"/>
+</classpath>
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.packages
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.packages (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.packages 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<packages>
+ <package name="acme-ejb3-beans-time.jar" type="org.jboss.ide.eclipse.as.core.packages.ejbPackageType" todir="/JBIDE2311/output/dist" exploded="false" inWorkspace="true">
+ <fileset dir="/JBIDE2311/output/eclipse" includes="**" excludes="**/SystemTimeBean**" inWorkspace="true" flatten="false">
+ <properties></properties>
+ </fileset>
+ <properties>
+ <property name="org.jboss.ide.eclipse.as.core.packages.ModuleIDPropertyKey" value="1212068280907"></property>
+ </properties>
+ </package>
+ <properties></properties>
+</packages>
\ No newline at end of file
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.project
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.project (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.project 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JBIDE2311</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.ide.eclipse.archives.core.archivesBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.jboss.ide.eclipse.archives.core.archivesNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ </natures>
+</projectDescription>
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.jdt.core.prefs 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,7 @@
+#Mon Jun 09 13:54:29 EDT 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.jst.common.project.facet.core.prefs
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,5 @@
+#Mon Jun 09 13:55:44 EDT 2008
+classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jdk1.6.0_03/owners=jst.java\:5.0
+classpath.helper/org.eclipse.jst.server.core.container\:\:org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget\:\:JBoss\ 4.2\ Runtime/owners=jst.ejb\:3.0
+classpath.helper/org.eclipse.jst.server.core.container\:\:org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget\:\:as-5.0.0.cr1-default/owners=\#system\#
+eclipse.preferences.version=1
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.ltk.core.refactoring.prefs
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.ltk.core.refactoring.prefs (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.ltk.core.refactoring.prefs 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,3 @@
+#Mon Apr 21 21:06:48 CEST 2008
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.wst.common.component
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.wst.common.component (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.wst.common.component 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="JBIDE2311">
+ <wb-resource deploy-path="/" source-path="/src/main/java"/>
+ <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+ <property name="java-output-path" value="build/classes"/>
+ </wb-module>
+</project-modules>
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 4.2 Runtime"/>
+ <installed facet="jst.java" version="5.0"/>
+ <installed facet="jst.ejb" version="3.0"/>
+</faceted-project>
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.hibernate.eclipse.console.prefs
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.hibernate.eclipse.console.prefs (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/.settings/org.hibernate.eclipse.console.prefs 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,4 @@
+#Mon Apr 21 21:06:48 CEST 2008
+default.configuration=
+eclipse.preferences.version=1
+hibernate3.enabled=false
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/META-INF/jboss.xml
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/META-INF/jboss.xml (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/META-INF/jboss.xml 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="3.0">
+ <enterprise-beans>
+ <session>
+ <ejb-name>TimeTellerBean</ejb-name>
+ <remote-binding>
+ <jndi-name>TimeTellerBean/remote</jndi-name>
+ <client-bind-url>
+ socket://${jboss.bind.address}:3873
+ </client-bind-url>
+ </remote-binding>
+ <remote-binding>
+ <jndi-name>TimeTellerBean/http</jndi-name>
+ <client-bind-url>
+ http://${jboss.bind.address}:8080/unified-invoker/Ejb3ServerInvokerServlet
+ </client-bind-url>
+ </remote-binding>
+ <remote-binding>
+ <jndi-name>TimeTellerBean/https</jndi-name>
+ <client-bind-url>
+ https://${jboss.bind.address}:8443/unified-invoker/SSLEjb3ServerInvokerServlet
+ </client-bind-url>
+ </remote-binding>
+ <!-- remote-binding>
+ <jndi-name>OverrideStatefulClusteredSSL</jndi-name>
+ <client-bind-url>sslsocket://0.0.0.0:3843</client-bind-url>
+ </remote-binding>
+ <remote-binding>
+ <jndi-name>OverrideStatefulClusteredNormal</jndi-name>
+ <client-bind-url>socket://0.0.0.0:3873</client-bind-url>
+ </remote-binding -->
+ </session>
+ </enterprise-beans>
+</jboss>
\ No newline at end of file
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/acme-interceptors-aop.xml
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/acme-interceptors-aop.xml (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/acme-interceptors-aop.xml 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE aop PUBLIC
+ "-//JBoss//DTD JBOSS AOP 1.0//EN"
+ "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
+
+<aop>
+ <interceptor class="com.acme.ejb3.jboss.interceptors.RemoteInvocationExceptionLogger" scope="PER_VM"/>
+
+ <domain name="acme-stateless-bean">
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <interceptor-ref name="Basic Authorization"/>
+ </bind>
+ <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
+ <interceptor-ref name="com.acme.ejb3.jboss.interceptors.RemoteInvocationExceptionLogger"/>
+ <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+ </bind>
+ <annotation expr="!class((a)org.jboss.annotation.ejb.PoolClass)">
+ @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
+ </annotation>
+ </domain>
+
+</aop>
\ No newline at end of file
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/com/acme/ejb3/javax/interceptors/InvocationLogger.class
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/com/acme/ejb3/javax/interceptors/InvocationLogger.class
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/roles.properties
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/roles.properties (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/roles.properties 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1 @@
+galder=jboss-seg
\ No newline at end of file
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/users.properties
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/users.properties (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/output/eclipse/users.properties 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1 @@
+galder=password
\ No newline at end of file
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/acme/ejb3/javax/interceptors/InvocationLogger.java
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/acme/ejb3/javax/interceptors/InvocationLogger.java (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/java/com/acme/ejb3/javax/interceptors/InvocationLogger.java 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, 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 com.acme.ejb3.javax.interceptors;
+
+import org.jboss.logging.Logger;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import java.util.Arrays;
+
+/**
+ * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a>
+ */
+public class InvocationLogger
+{
+ private static final Logger log = Logger.getLogger(InvocationLogger.class);
+
+ @AroundInvoke
+ public Object log(InvocationContext ctx) throws Exception
+ {
+ String signature = "class=" + ctx.getTarget().getClass() +
+ ", method=" + ctx.getMethod().getName() +
+ ", with parameters=" + Arrays.toString(ctx.getParameters());
+ try
+ {
+ log.info("*** entering " + signature);
+
+ return ctx.proceed();
+ }
+ finally
+ {
+ log.info("*** exiting " + signature);
+ }
+ }
+}
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/META-INF/jboss.xml
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/META-INF/jboss.xml (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/META-INF/jboss.xml 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="3.0">
+ <enterprise-beans>
+ <session>
+ <ejb-name>TimeTellerBean</ejb-name>
+ <remote-binding>
+ <jndi-name>TimeTellerBean/remote</jndi-name>
+ <client-bind-url>
+ socket://${jboss.bind.address}:3873
+ </client-bind-url>
+ </remote-binding>
+ <remote-binding>
+ <jndi-name>TimeTellerBean/http</jndi-name>
+ <client-bind-url>
+ http://${jboss.bind.address}:8080/unified-invoker/Ejb3ServerInvokerServlet
+ </client-bind-url>
+ </remote-binding>
+ <remote-binding>
+ <jndi-name>TimeTellerBean/https</jndi-name>
+ <client-bind-url>
+ https://${jboss.bind.address}:8443/unified-invoker/SSLEjb3ServerInvokerServlet
+ </client-bind-url>
+ </remote-binding>
+ <!-- remote-binding>
+ <jndi-name>OverrideStatefulClusteredSSL</jndi-name>
+ <client-bind-url>sslsocket://0.0.0.0:3843</client-bind-url>
+ </remote-binding>
+ <remote-binding>
+ <jndi-name>OverrideStatefulClusteredNormal</jndi-name>
+ <client-bind-url>socket://0.0.0.0:3873</client-bind-url>
+ </remote-binding -->
+ </session>
+ </enterprise-beans>
+</jboss>
\ No newline at end of file
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/acme-interceptors-aop.xml
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/acme-interceptors-aop.xml (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/acme-interceptors-aop.xml 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE aop PUBLIC
+ "-//JBoss//DTD JBOSS AOP 1.0//EN"
+ "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
+
+<aop>
+ <interceptor class="com.acme.ejb3.jboss.interceptors.RemoteInvocationExceptionLogger" scope="PER_VM"/>
+
+ <domain name="acme-stateless-bean">
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <interceptor-ref name="Basic Authorization"/>
+ </bind>
+ <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
+ </bind>
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
+ <interceptor-ref name="com.acme.ejb3.jboss.interceptors.RemoteInvocationExceptionLogger"/>
+ <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+ </bind>
+ <annotation expr="!class((a)org.jboss.annotation.ejb.PoolClass)">
+ @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
+ </annotation>
+ </domain>
+
+</aop>
\ No newline at end of file
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/roles.properties
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/roles.properties (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/roles.properties 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1 @@
+galder=jboss-seg
\ No newline at end of file
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/users.properties
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/users.properties (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2311/src/main/resources/users.properties 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1 @@
+galder=password
\ No newline at end of file
Modified: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2008-06-09 21:58:44 UTC (rev 8653)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2008-06-09 22:40:39 UTC (rev 8654)
@@ -9,6 +9,8 @@
import org.jboss.ide.eclipse.archives.test.model.ModelUtilTest;
import org.jboss.ide.eclipse.archives.test.model.XBMarshallTest;
import org.jboss.ide.eclipse.archives.test.model.XBUnmarshallTest;
+import org.jboss.ide.eclipse.archives.test.projects.JBIDE2099Test;
+import org.jboss.ide.eclipse.archives.test.projects.JBIDE2311Test;
import org.jboss.ide.eclipse.archives.test.util.TruezipUtilTest;
public class ArchivesTestSuite extends TestSuite {
@@ -21,6 +23,11 @@
suite.addTestSuite(ModelUtilTest.class);
suite.addTestSuite(ModelCreationTest.class);
suite.addTestSuite(ModelTruezipBridgeTest.class);
+
+ // jiras
+ suite.addTestSuite(JBIDE2099Test.class);
+ suite.addTestSuite(JBIDE2311Test.class);
+
return suite;
}
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2099Test.java
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2099Test.java (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2099Test.java 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,41 @@
+package org.jboss.ide.eclipse.archives.test.projects;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate;
+import org.jboss.ide.eclipse.archives.test.ArchivesTest;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+
+public class JBIDE2099Test extends TestCase {
+ private TestProjectProvider provider;
+ private IProject project;
+ private IPath outputWar;
+ protected void setUp() throws Exception {
+ provider = new TestProjectProvider(ArchivesTest.PLUGIN_ID,
+ "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2099",
+ null, true);
+ project = provider.getProject();
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ outputWar = project.getLocation().append("output").append("dist")
+ .append("unified-http-invoker.sar").append("unified-invoker.war");
+ }
+
+ protected void tearDown() throws Exception {
+ provider.dispose();
+ }
+
+ public void testJBIDE2099() {
+ ArchiveBuildDelegate delegate = new ArchiveBuildDelegate();
+ try {
+ delegate.fullProjectBuild(project.getLocation());
+ assertTrue(outputWar.toFile().isDirectory());
+ } catch( RuntimeException re ) {
+ fail();
+ }
+ }
+}
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2311Test.java
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2311Test.java (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2311Test.java 2008-06-09 22:40:39 UTC (rev 8654)
@@ -0,0 +1,37 @@
+package org.jboss.ide.eclipse.archives.test.projects;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate;
+import org.jboss.ide.eclipse.archives.test.ArchivesTest;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+
+public class JBIDE2311Test extends TestCase {
+ private TestProjectProvider provider;
+ private IProject project;
+
+ protected void setUp() throws Exception {
+ provider = new TestProjectProvider(ArchivesTest.PLUGIN_ID,
+ "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2311",
+ null, true);
+ project = provider.getProject();
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ }
+
+ protected void tearDown() throws Exception {
+ provider.dispose();
+ }
+
+ public void testJBIDE2311() {
+ ArchiveBuildDelegate delegate = new ArchiveBuildDelegate();
+ try {
+ delegate.fullProjectBuild(project.getLocation());
+ } catch( RuntimeException re ) {
+ fail();
+ }
+ }
+}
17 years, 10 months
- 1
- 0