[jboss-cvs] JBossAS SVN: r78103 - in projects/vfs/trunk: archives and 15 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 5 15:58:26 EDT 2008
Author: scott.stark at jboss.org
Date: 2008-09-05 15:58:26 -0400 (Fri, 05 Sep 2008)
New Revision: 78103
Added:
projects/vfs/trunk/archives/
projects/vfs/trunk/archives/web_pkg_scope/
projects/vfs/trunk/archives/web_pkg_scope/ear/
projects/vfs/trunk/archives/web_pkg_scope/ear/pom.xml
projects/vfs/trunk/archives/web_pkg_scope/pom.xml
projects/vfs/trunk/archives/web_pkg_scope/war/
projects/vfs/trunk/archives/web_pkg_scope/war/pom.xml
projects/vfs/trunk/archives/web_pkg_scope/war/src/
projects/vfs/trunk/archives/web_pkg_scope/war/src/main/
projects/vfs/trunk/archives/web_pkg_scope/war/src/main/java/
projects/vfs/trunk/archives/web_pkg_scope/war/src/main/java/web_pkg_scope/
projects/vfs/trunk/archives/web_pkg_scope/war/src/main/java/web_pkg_scope/entity/
projects/vfs/trunk/archives/web_pkg_scope/war/src/main/java/web_pkg_scope/entity/Account.java
projects/vfs/trunk/archives/web_pkg_scope/war/src/main/java/web_pkg_scope/servlet/
projects/vfs/trunk/archives/web_pkg_scope/war/src/main/java/web_pkg_scope/servlet/JpaServlet.java
projects/vfs/trunk/archives/web_pkg_scope/war/src/main/resources/
projects/vfs/trunk/archives/web_pkg_scope/war/src/main/resources/META-INF/
projects/vfs/trunk/archives/web_pkg_scope/war/src/main/resources/META-INF/persistence.xml
projects/vfs/trunk/archives/web_pkg_scope/war/src/main/webapp/
projects/vfs/trunk/archives/web_pkg_scope/war/src/main/webapp/WEB-INF/
projects/vfs/trunk/archives/web_pkg_scope/war/src/main/webapp/WEB-INF/web.xml
Modified:
projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JARVFSContextUnitTestCase.java
projects/vfs/trunk/src/test/resources/vfs/test/web_pkg_scope.ear
Log:
JBVFS-57, create the web_pkg_scope.ear locally
Added: projects/vfs/trunk/archives/web_pkg_scope/ear/pom.xml
===================================================================
--- projects/vfs/trunk/archives/web_pkg_scope/ear/pom.xml (rev 0)
+++ projects/vfs/trunk/archives/web_pkg_scope/ear/pom.xml 2008-09-05 19:58:26 UTC (rev 78103)
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <name>web_pkg_scope ear</name>
+ <groupId>org.jboss.vfs</groupId>
+ <artifactId>web_pkg_scope_ear</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>ear</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.vfs</groupId>
+ <artifactId>web_pkg_scope_web</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>web_pkg_scope</finalName>
+ <!--
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <modules>
+ <webModule>
+ <groupId>artifactGroupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <contextRoot>/custom-context-root</contextRoot>
+ </webModule>
+ </modules>
+ </configuration>
+ </plugin>
+ </plugins>
+ -->
+ </build>
+</project>
+
Added: projects/vfs/trunk/archives/web_pkg_scope/pom.xml
===================================================================
--- projects/vfs/trunk/archives/web_pkg_scope/pom.xml (rev 0)
+++ projects/vfs/trunk/archives/web_pkg_scope/pom.xml 2008-09-05 19:58:26 UTC (rev 78103)
@@ -0,0 +1,15 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <name>web_pkg_scope parent</name>
+ <groupId>org.jboss.vfs</groupId>
+ <artifactId>web_pkg_scope</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>ear</module>
+ <module>war</module>
+ </modules>
+</project>
Added: projects/vfs/trunk/archives/web_pkg_scope/war/pom.xml
===================================================================
--- projects/vfs/trunk/archives/web_pkg_scope/war/pom.xml (rev 0)
+++ projects/vfs/trunk/archives/web_pkg_scope/war/pom.xml 2008-09-05 19:58:26 UTC (rev 78103)
@@ -0,0 +1,24 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <name>web_pkg_scope war</name>
+ <groupId>org.jboss.vfs</groupId>
+ <artifactId>web_pkg_scope_web</artifactId>
+ <packaging>war</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <parent>
+ <groupId>org.jboss.vfs</groupId>
+ <artifactId>web_pkg_scope</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+
+ </dependencies>
+ <build>
+ <finalName>web_pkg_scope_web</finalName>
+ </build>
+</project>
Added: projects/vfs/trunk/archives/web_pkg_scope/war/src/main/java/web_pkg_scope/entity/Account.java
===================================================================
--- projects/vfs/trunk/archives/web_pkg_scope/war/src/main/java/web_pkg_scope/entity/Account.java (rev 0)
+++ projects/vfs/trunk/archives/web_pkg_scope/war/src/main/java/web_pkg_scope/entity/Account.java 2008-09-05 19:58:26 UTC (rev 78103)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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 web_pkg_scope.entity;
+
+/**
+ * Placeholder for an entity bean
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+public class Account
+{
+
+}
Added: projects/vfs/trunk/archives/web_pkg_scope/war/src/main/java/web_pkg_scope/servlet/JpaServlet.java
===================================================================
--- projects/vfs/trunk/archives/web_pkg_scope/war/src/main/java/web_pkg_scope/servlet/JpaServlet.java (rev 0)
+++ projects/vfs/trunk/archives/web_pkg_scope/war/src/main/java/web_pkg_scope/servlet/JpaServlet.java 2008-09-05 19:58:26 UTC (rev 78103)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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 web_pkg_scope.servlet;
+
+/**
+ * Placeholder for a servlet
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+public class JpaServlet
+{
+
+}
Added: projects/vfs/trunk/archives/web_pkg_scope/war/src/main/resources/META-INF/persistence.xml
===================================================================
--- projects/vfs/trunk/archives/web_pkg_scope/war/src/main/resources/META-INF/persistence.xml (rev 0)
+++ projects/vfs/trunk/archives/web_pkg_scope/war/src/main/resources/META-INF/persistence.xml 2008-09-05 19:58:26 UTC (rev 78103)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+ <persistence-unit
+ name="AccountManager"
+ transaction-type="JTA">
+ <description>Persistence Unit Package Tests</description>
+ <jta-data-source>jdbc/DB1</jta-data-source>
+ </persistence-unit>
+</persistence>
Added: projects/vfs/trunk/archives/web_pkg_scope/war/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/vfs/trunk/archives/web_pkg_scope/war/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ projects/vfs/trunk/archives/web_pkg_scope/war/src/main/webapp/WEB-INF/web.xml 2008-09-05 19:58:26 UTC (rev 78103)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" 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://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <display-name>web_pkg_scope</display-name>
+ <servlet>
+ <servlet-name>ServletTest</servlet-name>
+ <servlet-class>web_pkg_scope.servlet.JpaServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ServletTest</servlet-name>
+ <url-pattern>/ServletTest</url-pattern>
+ </servlet-mapping>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
+ <persistence-context-ref>
+ <description>My Entity Manager</description>
+ <persistence-context-ref-name>persistence/MyEM</persistence-context-ref-name>
+ <persistence-unit-name>AccountManager</persistence-unit-name>
+ <persistence-context-type>Transaction</persistence-context-type>
+ </persistence-context-ref>
+</web-app>
Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JARVFSContextUnitTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JARVFSContextUnitTestCase.java 2008-09-05 18:11:14 UTC (rev 78102)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JARVFSContextUnitTestCase.java 2008-09-05 19:58:26 UTC (rev 78103)
@@ -235,33 +235,22 @@
}
/** All of the following entries should be seen
-jar -tf web_pkg_scope_web.war
- 106 Wed Sep 03 10:41:36 PDT 2008 META-INF/MANIFEST.MF
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/ts/
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/ts/tests/
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/ts/tests/ejb30/
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/ts/tests/ejb30/persistence/
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/ts/tests/ejb30/persistence/ee/
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/ts/tests/ejb30/persistence/ee/packaging/
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/ts/tests/ejb30/persistence/ee/packaging/web/
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/ts/tests/ejb30/persistence/ee/packaging/web/scope/
- 5074 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/ts/tests/ejb30/persistence/ee/packaging/web/scope/ServletTest.class
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/ts/tests/ejb30/persistence/ee/common/
- 1160 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/ts/tests/ejb30/persistence/ee/common/Account.class
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/ts/tests/servlet/
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/ts/tests/servlet/common/
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/ts/tests/servlet/common/servlets/
- 2935 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/ts/tests/servlet/common/servlets/HttpTCKServlet.class
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/ts/tests/servlet/common/util/
- 432 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/com/sun/ts/tests/servlet/common/util/Data.class
- 0 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/META-INF/
- 338 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/classes/META-INF/persistence.xml
- 1050 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/web.xml
- 280 Wed Sep 03 10:41:36 PDT 2008 WEB-INF/jboss-web.xml
+[551][valkyrie: web_pkg_scope]$ jar -tvf war/target/web_pkg_scope_web.war
+ 0 Fri Sep 05 12:47:30 PDT 2008 META-INF/
+ 126 Fri Sep 05 12:47:28 PDT 2008 META-INF/MANIFEST.MF
+ 0 Fri Sep 05 12:07:32 PDT 2008 WEB-INF/
+ 0 Fri Sep 05 12:07:32 PDT 2008 WEB-INF/classes/
+ 0 Fri Sep 05 12:07:32 PDT 2008 WEB-INF/classes/web_pkg_scope/
+ 0 Fri Sep 05 12:07:32 PDT 2008 WEB-INF/classes/web_pkg_scope/entity/
+ 0 Fri Sep 05 12:07:32 PDT 2008 WEB-INF/classes/web_pkg_scope/servlet/
+ 288 Fri Sep 05 12:07:30 PDT 2008 WEB-INF/classes/web_pkg_scope/entity/Account.class
+ 299 Fri Sep 05 12:07:30 PDT 2008 WEB-INF/classes/web_pkg_scope/servlet/JpaServlet.class
+ 1055 Fri Sep 05 12:25:02 PDT 2008 WEB-INF/web.xml
+ 0 Fri Sep 05 12:47:30 PDT 2008 META-INF/maven/
+ 0 Fri Sep 05 12:47:30 PDT 2008 META-INF/maven/org.jboss.vfs/
+ 0 Fri Sep 05 12:47:30 PDT 2008 META-INF/maven/org.jboss.vfs/web_pkg_scope_web/
+ 735 Fri Sep 05 12:47:20 PDT 2008 META-INF/maven/org.jboss.vfs/web_pkg_scope_web/pom.xml
+ 122 Fri Sep 05 12:47:28 PDT 2008 META-INF/maven/org.jboss.vfs/web_pkg_scope_web/pom.properties
* @throws Exception
*/
public void testWarClassesJarInputStream() throws Exception
@@ -274,32 +263,11 @@
// Access the classes contents as a jar file
URL classesURL = classes.toURL();
String[] entryNames = {
- "META-INF/MANIFEST.MF",
- "WEB-INF/",
- "WEB-INF/classes/",
- "WEB-INF/classes/com/",
- "WEB-INF/classes/com/sun/",
- "WEB-INF/classes/com/sun/ts/",
- "WEB-INF/classes/com/sun/ts/tests/",
- "WEB-INF/classes/com/sun/ts/tests/ejb30/",
- "WEB-INF/classes/com/sun/ts/tests/ejb30/persistence/",
- "WEB-INF/classes/com/sun/ts/tests/ejb30/persistence/ee/",
- "WEB-INF/classes/com/sun/ts/tests/ejb30/persistence/ee/packaging/",
- "WEB-INF/classes/com/sun/ts/tests/ejb30/persistence/ee/packaging/web/",
- "WEB-INF/classes/com/sun/ts/tests/ejb30/persistence/ee/packaging/web/scope/",
- "WEB-INF/classes/com/sun/ts/tests/ejb30/persistence/ee/packaging/web/scope/ServletTest.class",
- "WEB-INF/classes/com/sun/ts/tests/ejb30/persistence/ee/common/",
- "WEB-INF/classes/com/sun/ts/tests/ejb30/persistence/ee/common/Account.class",
- "WEB-INF/classes/com/sun/ts/tests/servlet/",
- "WEB-INF/classes/com/sun/ts/tests/servlet/common/",
- "WEB-INF/classes/com/sun/ts/tests/servlet/common/servlets/",
- "WEB-INF/classes/com/sun/ts/tests/servlet/common/servlets/HttpTCKServlet.class",
- "WEB-INF/classes/com/sun/ts/tests/servlet/common/util/",
- "WEB-INF/classes/com/sun/ts/tests/servlet/common/util/Data.class",
- "WEB-INF/classes/META-INF/",
- "WEB-INF/classes/META-INF/persistence.xml",
- "WEB-INF/web.xml",
- "WEB-INF/jboss-web.xml"
+ "web_pkg_scope/",
+ "web_pkg_scope/entity/",
+ "web_pkg_scope/servlet/",
+ "web_pkg_scope/entity/Account.class",
+ "web_pkg_scope/servlet/JpaServlet.class"
};
JarInputStream jis = new JarInputStream( classesURL.openStream() );
HashSet<String> missingEntries = new HashSet<String>(Arrays.asList(entryNames));
Modified: projects/vfs/trunk/src/test/resources/vfs/test/web_pkg_scope.ear
===================================================================
(Binary files differ)
More information about the jboss-cvs-commits
mailing list