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();
+ }
+ }
+}