Move WebContent -> src/main/webapp

weld · May 28, 2009 · e823f4a · e823f4a
1 parent 4cc7b5e
commit e823f4a
Show file tree

Hide file tree

Showing 45 changed files with 45 additions and 26 deletions.
diff --git a/...bContent/WEB-INF/.faces-config.xml.jsfdia → ...n/webapp/WEB-INF/.faces-config.xml.jsfdia b/...bContent/WEB-INF/.faces-config.xml.jsfdia → ...n/webapp/WEB-INF/.faces-config.xml.jsfdia
diff --git a/conversations/WebContent/WEB-INF/beans.xml → ...sations/src/main/webapp/WEB-INF/beans.xml b/conversations/WebContent/WEB-INF/beans.xml → ...sations/src/main/webapp/WEB-INF/beans.xml
diff --git a/...tions/WebContent/WEB-INF/faces-config.xml → .../src/main/webapp/WEB-INF/faces-config.xml b/...tions/WebContent/WEB-INF/faces-config.xml → .../src/main/webapp/WEB-INF/faces-config.xml
diff --git a/conversations/WebContent/WEB-INF/web.xml → ...ersations/src/main/webapp/WEB-INF/web.xml b/conversations/WebContent/WEB-INF/web.xml → ...ersations/src/main/webapp/WEB-INF/web.xml
diff --git a/conversations/WebContent/home.xhtml → conversations/src/main/webapp/home.xhtml b/conversations/WebContent/home.xhtml → conversations/src/main/webapp/home.xhtml
diff --git a/conversations/WebContent/index.html → conversations/src/main/webapp/index.html b/conversations/WebContent/index.html → conversations/src/main/webapp/index.html
diff --git a/conversations/WebContent/template.xhtml → conversations/src/main/webapp/template.xhtml b/conversations/WebContent/template.xhtml → conversations/src/main/webapp/template.xhtml
diff --git a/jsf2/pom.xml b/jsf2/pom.xml
@@ -4,7 +4,7 @@
 
    <parent>
       <groupId>org.jboss.webbeans.examples</groupId>
-      <artifactId>parent</artifactId>
+      <artifactId>webbeans-examples-parent</artifactId>
       <version>1.0.0-SNAPSHOT</version>
    </parent>
 

diff --git a/jsf2/WebContent/WEB-INF/beans.xml → jsf2/src/main/webapp/WEB-INF/beans.xml b/jsf2/WebContent/WEB-INF/beans.xml → jsf2/src/main/webapp/WEB-INF/beans.xml
diff --git a/jsf2/WebContent/WEB-INF/faces-config.xml → .../src/main/webapp/WEB-INF/faces-config.xml b/jsf2/WebContent/WEB-INF/faces-config.xml → .../src/main/webapp/WEB-INF/faces-config.xml
diff --git a/jsf2/WebContent/WEB-INF/web.xml → jsf2/src/main/webapp/WEB-INF/web.xml b/jsf2/WebContent/WEB-INF/web.xml → jsf2/src/main/webapp/WEB-INF/web.xml
diff --git a/jsf2/WebContent/home.xhtml → jsf2/src/main/webapp/home.xhtml b/jsf2/WebContent/home.xhtml → jsf2/src/main/webapp/home.xhtml
diff --git a/jsf2/WebContent/index.html → jsf2/src/main/webapp/index.html b/jsf2/WebContent/index.html → jsf2/src/main/webapp/index.html
diff --git a/jsf2/WebContent/template.xhtml → jsf2/src/main/webapp/template.xhtml b/jsf2/WebContent/template.xhtml → jsf2/src/main/webapp/template.xhtml
diff --git a/login/WebContent/WEB-INF/beans.xml → login/src/main/webapp/WEB-INF/beans.xml b/login/WebContent/WEB-INF/beans.xml → login/src/main/webapp/WEB-INF/beans.xml
diff --git a/login/WebContent/WEB-INF/faces-config.xml → .../src/main/webapp/WEB-INF/faces-config.xml b/login/WebContent/WEB-INF/faces-config.xml → .../src/main/webapp/WEB-INF/faces-config.xml
diff --git a/login/WebContent/WEB-INF/web.xml → login/src/main/webapp/WEB-INF/web.xml b/login/WebContent/WEB-INF/web.xml → login/src/main/webapp/WEB-INF/web.xml
diff --git a/login/WebContent/home.xhtml → login/src/main/webapp/home.xhtml b/login/WebContent/home.xhtml → login/src/main/webapp/home.xhtml
diff --git a/login/WebContent/index.html → login/src/main/webapp/index.html b/login/WebContent/index.html → login/src/main/webapp/index.html
diff --git a/login/WebContent/template.xhtml → login/src/main/webapp/template.xhtml b/login/WebContent/template.xhtml → login/src/main/webapp/template.xhtml
diff --git a/numberguess/pom.xml b/numberguess/pom.xml
@@ -4,7 +4,7 @@
 
    <parent>
       <groupId>org.jboss.webbeans.examples</groupId>
-      <artifactId>parent</artifactId>
+      <artifactId>webbeans-examples-parent</artifactId>
       <version>1.0.0-SNAPSHOT</version>
    </parent>
 

diff --git a/numberguess/WebContent/WEB-INF/beans.xml → ...erguess/src/main/webapp/WEB-INF/beans.xml b/numberguess/WebContent/WEB-INF/beans.xml → ...erguess/src/main/webapp/WEB-INF/beans.xml
diff --git a/...guess/WebContent/WEB-INF/faces-config.xml → .../src/main/webapp/WEB-INF/faces-config.xml b/...guess/WebContent/WEB-INF/faces-config.xml → .../src/main/webapp/WEB-INF/faces-config.xml
diff --git a/numberguess/WebContent/WEB-INF/web.xml → numberguess/src/main/webapp/WEB-INF/web.xml b/numberguess/WebContent/WEB-INF/web.xml → numberguess/src/main/webapp/WEB-INF/web.xml
diff --git a/numberguess/WebContent/home.xhtml → numberguess/src/main/webapp/home.xhtml b/numberguess/WebContent/home.xhtml → numberguess/src/main/webapp/home.xhtml
diff --git a/numberguess/WebContent/index.html → numberguess/src/main/webapp/index.html b/numberguess/WebContent/index.html → numberguess/src/main/webapp/index.html
diff --git a/numberguess/WebContent/template.xhtml → numberguess/src/main/webapp/template.xhtml b/numberguess/WebContent/template.xhtml → numberguess/src/main/webapp/template.xhtml
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
       <version>1.0.0-SNAPSHOT</version>
    </parent>
    <groupId>org.jboss.webbeans.examples</groupId>
-   <artifactId>parent</artifactId>
+   <artifactId>webbeans-examples-parent</artifactId>
    <packaging>pom</packaging>
    <version>1.0.0-SNAPSHOT</version>
    <name>Web Beans Examples</name>
@@ -151,9 +151,6 @@
             <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-war-plugin</artifactId>
-               <configuration>
-                  <warSourceDirectory>${basedir}/WebContent</warSourceDirectory>
-               </configuration>
             </plugin>
             <plugin>
                <groupId>org.apache.maven.plugins</groupId>

diff --git a/se/hello-world/pom.xml b/se/hello-world/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
     <parent>
-        <artifactId>parent</artifactId>
+        <artifactId>webbeans-examples-parent</artifactId>
         <groupId>org.jboss.webbeans.examples</groupId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>

diff --git a/se/numberguess/pom.xml b/se/numberguess/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
     <parent>
-        <artifactId>parent</artifactId>
+        <artifactId>webbeans-examples-parent</artifactId>
         <groupId>org.jboss.webbeans.examples</groupId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>

diff --git a/se/numberguess/src/etc/header.txt b/se/numberguess/src/etc/header.txt
diff --git a/servlet-numberguess/pom.xml b/servlet-numberguess/pom.xml
@@ -4,7 +4,7 @@
 
    <parent>
       <groupId>org.jboss.webbeans.examples</groupId>
-      <artifactId>parent</artifactId>
+      <artifactId>webbeans-examples-parent</artifactId>
       <version>1.0.0-SNAPSHOT</version>
    </parent>
 

diff --git a/translator/.settings/org.eclipse.jdt.core.prefs b/translator/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+#Thu May 28 16:16:57 BST 2009
+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.source=1.5
diff --git a/translator/.settings/org.maven.ide.eclipse.prefs b/translator/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,9 @@
+#Thu May 28 16:16:54 BST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/translator/pom.xml b/translator/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.jboss.webbeans.examples</groupId>
-      <artifactId>parent</artifactId>
+      <artifactId>webbeans-examples-parent</artifactId>
       <version>1.0.0-SNAPSHOT</version>
    </parent>
    <groupId>org.jboss.webbeans.examples.translator</groupId>

diff --git a/translator/webbeans-translator-ear/src/main/application/META-INF/application.xml b/translator/webbeans-translator-ear/src/main/application/META-INF/application.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
+<application id="Application_ID">
+	<display-name>webbeans-translator-ear</display-name>
+	<module id="EjbModule_1243523823235">
+		<ejb>webbeans-translator-ejb-1.0.0-SNAPSHOT.jar</ejb>
+	</module>
+	<module id="WebModule_1243523823253">
+		<web>
+			<web-uri>webbeans-translator-war-1.0.0-SNAPSHOT.war</web-uri>
+			<context-root>webbeans-translator-war</context-root>
+		</web>
+	</module>
+</application>
diff --git a/translator/webbeans-translator-ejb/src/main/resources/META-INF/MANIFEST.MF b/translator/webbeans-translator-ejb/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+
diff --git a/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml b/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar id="ejb-jar_ID" version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
+	<display-name>
+	webbeans-translator-ejb</display-name>
+</ejb-jar>
diff --git a/...r-war/WebContent/WEB-INF/faces-config.xml → .../src/main/webapp/WEB-INF/faces-config.xml b/...r-war/WebContent/WEB-INF/faces-config.xml → .../src/main/webapp/WEB-INF/faces-config.xml
diff --git a/...translator-war/WebContent/WEB-INF/web.xml → ...lator-war/src/main/webapp/WEB-INF/web.xml b/...translator-war/WebContent/WEB-INF/web.xml → ...lator-war/src/main/webapp/WEB-INF/web.xml
diff --git a/...eans-translator-war/WebContent/home.xhtml → ...translator-war/src/main/webapp/home.xhtml b/...eans-translator-war/WebContent/home.xhtml → ...translator-war/src/main/webapp/home.xhtml
diff --git a/...eans-translator-war/WebContent/index.html → ...translator-war/src/main/webapp/index.html b/...eans-translator-war/WebContent/index.html → ...translator-war/src/main/webapp/index.html
diff --git a/...-translator-war/WebContent/template.xhtml → ...slator-war/src/main/webapp/template.xhtml b/...-translator-war/WebContent/template.xhtml → ...slator-war/src/main/webapp/template.xhtml
diff --git a/wicket/conversations/pom.xml b/wicket/conversations/pom.xml
@@ -4,7 +4,7 @@
 
    <parent>
       <groupId>org.jboss.webbeans.examples</groupId>
-      <artifactId>parent</artifactId>
+      <artifactId>webbeans-examples-parent</artifactId>
       <version>1.0.0-SNAPSHOT</version>
       <relativePath>../../pom.xml</relativePath>
    </parent>

diff --git a/wicket/numberguess/pom.xml b/wicket/numberguess/pom.xml
@@ -4,7 +4,7 @@
 
    <parent>
       <groupId>org.jboss.webbeans.examples</groupId>
-      <artifactId>parent</artifactId>
+      <artifactId>webbeans-examples-parent</artifactId>
       <version>1.0.0-SNAPSHOT</version>
       <relativePath>../../pom.xml</relativePath>
    </parent>