diff --git a/docs/reference/src/main/asciidoc/gettingstarted.asciidoc b/docs/reference/src/main/asciidoc/gettingstarted.asciidoc index bf16507757b..d8df6bfb4ee 100644 --- a/docs/reference/src/main/asciidoc/gettingstarted.asciidoc +++ b/docs/reference/src/main/asciidoc/gettingstarted.asciidoc @@ -172,33 +172,17 @@ of WildFly (or Apache Tomcat). Next, make sure the `GLASSFISH_HOME` environment variable is set to point to the GlassFish installation. -Now switch to the example directory again and create a new GlassFish -domain for the example. +Now switch to the `GLASSFISH_HOME` directory and deploy the example. [source, console] ------------------------------ -$> cd examples/jsf/numberguess -$> mvn glassfish:create-domain +$> ./bin/asadmin +asadmin> deploy /path/examples/jsf/numberguess/target/weld-numberguess.war ------------------------------ -You are now ready to deploy the example by running: - -[source, console] -------------------------------- -$> mvn package glassfish:deploy -------------------------------- - Once the command completes the application is available at http://localhost:7070/weld-numberguess -The example is deployed using the `maven-glassfish-plugin`. For more -information about the plugin see the -http://maven-glassfish-plugin.java.net/[plugin documentation] - -There are alternative ways of,deploying applications to GlassFish either -by using the http://localhost:4848[GlassFish Admin Console] or the -`asadmin` command. - The reason the same artifact can be deployed to both WildFly and GlassFish, without any modifications, is because all of the features being used are part of the standard platform. And what a capable @@ -221,13 +205,13 @@ your application might require some additional configuration as well (see <<_tomcat>> and <<_jetty>> for more info). Let's give the Weld servlet extension a spin on Apache Tomcat. First, -you'll need to download Tomcat 7.0.50 or later from -http://tomcat.apache.org/download-70.cgi[tomcat.apache.org] and extract +you'll need to download Tomcat 8.0.42 or later from +http://tomcat.apache.org/download-80.cgi[tomcat.apache.org] and extract it. [source, console] --------------------------------- -$> unzip apache-tomcat-7.0.53.zip +$> unzip apache-tomcat-8.0.42.zip --------------------------------- The Maven plugin communicates with Tomcat over HTTP, so it doesn't care @@ -237,16 +221,7 @@ hostname of localhost and port `8080`. The `readme.txt` file in the example directory has information about how to modify the Maven settings to accommodate a different setup. -To allow Maven to communicate with Tomcat over HTTP, edit the -`conf/tomcat-users.xml` file in your Tomcat installation. For Tomcat 7 -and higher add the following line: - -[source.XML, xml] ------------------------------------------------------------ - ------------------------------------------------------------ - -Next, start Tomcat. You can either start Tomcat from a Linux shell: +You can either start Tomcat from a Linux shell: [source, console] ------------------------------ @@ -264,116 +239,18 @@ $> start or you can start the server using an IDE, like Eclipse. -Now you're ready to deploy the numberguess example to Tomcat! - Change to the `examples/jsf/numberguess` directory again and run the following Maven command: [source, console] --------------------------------------------------------- $> cd examples/jsf/numberguess -$> mvn clean compile war:exploded tomcat7:deploy -Ptomcat +$> mvn clean package -Ptomcat --------------------------------------------------------- -Once the application is deployed, you can redeploy it using this -command: - -[source, console] --------------------------------- -$> mvn tomcat7:redeploy -Ptomcat --------------------------------- - -The `-Ptomcat` argument activates the `tomcat` profile defined in the -Maven POM (`pom.xml`). Among other things, this profile activates the -Tomcat plugin. - -Rather than shipping the container off to a standalone Tomcat -installation, you can also execute the application in an embedded Tomcat -6 container: - -[source, console] ---------------------------------------- -$> mvn war:inplace tomcat7:run -Ptomcat ---------------------------------------- - -The advantage of using the embedded server is that changes to assets in -`src/main/webapp` take effect immediately. If a change to a webapp -configuration file is made, the application may automatically redeploy -(depending on the plugin configuration). If you make a change to a -classpath resource, you need to execute a build: - -[source, console] ------------------------------------ -$> mvn compile war:inplace -Ptomcat ------------------------------------ - -Finally, you can run the functional tests: - -[source, console] ------------------------------------------------------ -$> mvn verify -Darquillian=tomcat-embedded-7 -Ptomcat ------------------------------------------------------ - -There are several other Maven goals that you can use if you are hacking -on the example, which are documented in the example's `README.md` file. - -=== Deploying to Jetty - -WARNING: Jetty Maven plugin is temporarily unsupported in Weld examples. - -If you've read through the entire Tomcat section, then you're all ready -to go. The Maven build parallels the embedded Tomcat deployment. If not, -don't worry. We'll still go over everything that you need to know again -in this section. - -The Maven POM (`pom.xml`) includes a profile named `jetty` that -activates the Maven Jetty plugin, which you can use to start Jetty in -embedded mode and deploy the application in place. You don't need -anything else installed except to have the Maven command (`mvn`) on your -path. The rest will be downloaded from the internet when the build is -run. - -To run the `weld-numberguess` example on Jetty, switch to the example -directory and execute the `inplace` goal of the Maven war plugin -followed by the `run` goal of the Maven Jetty plugin with the `jetty` -profile enabled, as follows: - -[source, console] ------------------------------------- -$> cd examples/jsf/numberguess -$> mvn war:inplace jetty:run -Pjetty ------------------------------------- - -The log output of Jetty will be shown in the console. Once Jetty reports -that the application has deployed, you can access it at the following -local URL: http://localhost:9090/weld-numberguess. The port is defined -in the Maven Jetty plugin configuration within the `jetty` profile. - -Any changes to assets in `src/main/webapp` take effect immediately. If a -change to a webapp configuration file is made, the application may -automatically redeploy. The redeploy behavior can be fined-tuned in the -plugin configuration. If you make a change to a classpath resource, you -need to execute a build and the `inplace` goal of the Maven war plugin, -again with the `jetty` profile enabled. - -[source, console] ----------------------------------- -$> mvn compile war:inplace -Pjetty ----------------------------------- - -The `war:inplace` goal copies the compiled classes and jars inside -`src/main/webapp`, under `WEB-INF/classes` and `WEB-INF/lib`, -respectively, mixing source and compiled files. However, the build does -work around these temporary files by excluding them from the packaged -war and cleaning them during the Maven clean phase. - -Finally, you can run the functional tests: +Now you're ready to deploy the numberguess example to Tomcat! [source, console] ---------------------------------------------------- -$> mvn verify -Darquillian=jetty-embedded-7 -Pjetty ---------------------------------------------------- - -Now that you have gotten the starter applications deployed on the server -of your choice, you probably want to know a little bit about how they -actually work. +--------------------------------------------------------- +$> cp examples/jsf/numberguess/target/weld-numberguess.war apache-tomcat/webapps/ +--------------------------------------------------------- diff --git a/examples/README.md b/examples/README.md index 800bb1ded59..70feee4e5a2 100644 --- a/examples/README.md +++ b/examples/README.md @@ -67,11 +67,5 @@ The` jsf/numberguess` example can also be tested in a cluster. Follow these step -Dnode1.contextPath=http://127.0.1.1:8080/weld-numberguess -Dnode2.contextPath=http://127.0.2.1:8080/weld-numberguess -The `jsf/numberguess` and `jsf/permalink` examples can be also tested with Tomcat and Jetty embedded containers. The following command will execute functional tests with embedded Tomcat container: - mvn -Ptomcat -Darquillian=tomcat-embedded-6 clean verify - -The following command will execute functional tests with embedded Jetty container: - - mvn -Pjetty -Darquillian=jetty-embedded-7 clean verify diff --git a/examples/jsf/numberguess/README.md b/examples/jsf/numberguess/README.md index 7350b9e4da1..e6af83296af 100644 --- a/examples/jsf/numberguess/README.md +++ b/examples/jsf/numberguess/README.md @@ -45,82 +45,14 @@ Make sure you have assigned the absolute path of your installation to the 3. Now you can view the application at . -Deploying to GlassFish ----------------------- - -Firstly, verify that the `GLASSFISH_HOME` environment variable points to your -GlassFish installation. - -Then, create a new domain for the application: - - mvn glassfish:create-domain - -Finally, deploy the application using: - - mvn package glassfish:deploy - -The application becomes available at - - -Deploying to standalone Tomcat 7 +Deploying to standalone Tomcat 8 -------------------------------- If you want to run the application on a standalone Tomcat, first download and extract Tomcat. This build assumes you will be running Tomcat in its default -configuration, with a hostname of localhost and port 8080. Before starting -Tomcat, add the following line to `conf/tomcat-users.xml` to allow the Maven -Tomcat plugin to access the manager application, then start Tomcat: - - - -To override this username and password, add a `` with id `tomcat` in your -Maven `settings.xml` file, set the `` and `` elqements to the -appropriate values and uncomment the `` element inside the -tomcat-maven-plugin configuration in the `pom.xml`. - -You can deploy it as an exploded archive immediately after the war goal is -finished assembling the exploded structure: - - mvn clean compile war:exploded tomcat7:deploy -Ptomcat - -Once the application is deployed, you can redeploy it using this command: - - mvn tomcat7:redeploy -Ptomcat - -But likely you want to run one or more build goals first before you redeploy: - - mvn compile tomcat7:redeploy -Ptomcat - mvn war:exploded tomcat7:redeploy -Ptomcat - mvn compile war:exploded tomcat7:redeploy -Ptomcat - -Now you can view the application at . - -To undeploy, use: - - mvn tomcat7:undeploy -Ptomcat - -Deploying to embedded Jetty ---------------------------- - -Simply run: - - mvn war:inplace jetty:run -Pjetty - -The application will be running at - -NOTE: This configuration currently does not work on Maven 3.1.x due to class loading conflicts regarding JSR-330 - -Using Google App Engine ------------------------ - -First, set up the Eclipse environment: - - mvn clean eclipse:clean eclipse:eclipse -Pgae - -Make sure you have the Google App Engine Eclipse plugin installed. - -Next, put all the needed resources into the `src/main/webapp` - - mvn war:inplace -Pgae - -Now, in Eclipse, you can either run the app locally, or deploy it to Google App Engine. +configuration, with a hostname of localhost and port 8080. Build example using +command + + mvn clean package -Ptomcat + +and deploy created WAR to Tomcat. \ No newline at end of file diff --git a/examples/jsf/numberguess/pom.xml b/examples/jsf/numberguess/pom.xml index 6f604d62497..257473c865d 100644 --- a/examples/jsf/numberguess/pom.xml +++ b/examples/jsf/numberguess/pom.xml @@ -116,12 +116,6 @@ tomcat - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec - compile - - org.jboss.spec.javax.faces jboss-jsf-api_2.2_spec @@ -163,149 +157,6 @@ - - - jetty - - - - javax.enterprise - cdi-api - - - - javax.inject - javax.inject - - - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec - compile - - - - org.jboss.weld.servlet - weld-servlet-core - runtime - - - - org.jboss.spec.javax.faces - jboss-jsf-api_2.2_spec - - - - com.sun.faces - jsf-impl - runtime - - - - org.jboss.weld - weld-core-impl - runtime - - - - org.jboss.weld - weld-core-jsf - runtime - - - - org.glassfish.web - el-impl - runtime - - - javax.el - el-api - - - - - - - - - - org.apache.maven.plugins - maven-war-plugin - - - - src/main/webapp-jetty - false - - - - - - - - - gae - - - - - - javax.faces - jsf-api - 1.2_13 - - - - javax.faces - jsf-impl - runtime - 1.2_13 - - - - org.jboss.weld.servlet - weld-servlet - runtime - - - - com.sun.facelets - jsf-facelets - 1.1.15.B1 - - - - javax.el - el-api - 1.1 - - - - org.glassfish.web - el-impl - 1.1 - - - - - - - org.apache.maven.plugins - maven-war-plugin - - - - src/main/webapp-gae - false - - - - - - - - ftest @@ -323,10 +174,6 @@ - - arquillian-jetty-embedded-7 - - arquillian-wildfly-managed-8 @@ -366,11 +213,7 @@ WEB-INF/classes/** WEB-INF/lib/** - META-INF/context.xml WEB-INF/web.xml - WEB-INF/jetty-env.xml - WEB-INF/jetty-context.xml - WEB-INF/appengine-web.xml WEB-INF/logging.properties false @@ -379,46 +222,6 @@ - - org.apache.tomcat.maven - tomcat7-maven-plugin - - /${project.build.finalName} - - - http://localhost:${tomcat.http.port}/manager/text - - - - - - - org.mortbay.jetty - jetty-maven-plugin - ${jetty.version} - - - - ${jetty.http.port} - 3600000 - - - 10 - - /${project.build.finalName} - src/main/webapp-jetty/WEB-INF/jetty-env.xml - - src/main/webapp-jetty/WEB-INF/jetty-context.xml - - - - - org.apache.maven.plugins maven-surefire-plugin @@ -431,12 +234,6 @@ - 9090 - 9190 - 8080 - 9090 - 9190 - http://127.0.1.1:8080/weld-numberguess http://127.0.2.1:8080/weld-numberguess diff --git a/examples/jsf/numberguess/src/ftest/resources/arquillian.xml b/examples/jsf/numberguess/src/ftest/resources/arquillian.xml index e5152e3bca7..9f4cde1cbd2 100644 --- a/examples/jsf/numberguess/src/ftest/resources/arquillian.xml +++ b/examples/jsf/numberguess/src/ftest/resources/arquillian.xml @@ -11,15 +11,6 @@ - - - true - - - - - - diff --git a/examples/jsf/numberguess/src/glassfish/password_file b/examples/jsf/numberguess/src/glassfish/password_file deleted file mode 100644 index 908d6b8a741..00000000000 --- a/examples/jsf/numberguess/src/glassfish/password_file +++ /dev/null @@ -1,3 +0,0 @@ -AS_MASTER_PASSWORD=admin -AS_ADMIN_PASSWORD=admin -AS_ADMIN_USERPASSWORD=admin diff --git a/examples/jsf/numberguess/src/jetty/java/Start.java b/examples/jsf/numberguess/src/jetty/java/Start.java deleted file mode 100755 index 0f3c737d83d..00000000000 --- a/examples/jsf/numberguess/src/jetty/java/Start.java +++ /dev/null @@ -1,42 +0,0 @@ -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.bio.SocketConnector; -import org.mortbay.jetty.webapp.WebAppContext; - -public class Start { - - public static void main(String[] args) throws Exception { - Server server = new Server(); - SocketConnector connector = new SocketConnector(); - connector.setPort(8080); - server.setConnectors(new Connector[]{connector}); - - WebAppContext bb = new WebAppContext(); - bb.setServer(server); - bb.setContextPath("/"); - bb.setWar("src/main/webapp"); - - // Disable for now -// Resource jettyEnv = Resource.newResource("src/main/webapp-jetty/WEB-INF/jetty-env.xml"); -// if (jettyEnv.exists() && !jettyEnv.isDirectory()) -// { -// XmlConfiguration configuration = new XmlConfiguration(jettyEnv.getURL()); -// configuration.configure(bb); -// } - - server.addHandler(bb); - - try { - System.out.println(">>> STARTING EMBEDDED JETTY SERVER, PRESS ANY KEY TO STOP"); - server.start(); - while (System.in.available() == 0) { - Thread.sleep(500); - } - server.stop(); - server.join(); - } catch (Exception e) { - e.printStackTrace(); - System.exit(100); - } - } -} diff --git a/examples/jsf/numberguess/src/jetty/resources/log4j.properties b/examples/jsf/numberguess/src/jetty/resources/log4j.properties deleted file mode 100755 index b4e60c58448..00000000000 --- a/examples/jsf/numberguess/src/jetty/resources/log4j.properties +++ /dev/null @@ -1,10 +0,0 @@ -log4j.appender.Stdout=org.apache.log4j.ConsoleAppender -log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m\n - - -log4j.rootLogger=INFO,Stdout - -log4j.logger.org.jboss.weld=DEBUG - - diff --git a/examples/jsf/numberguess/src/main/webapp-gae/WEB-INF/appengine-web.xml b/examples/jsf/numberguess/src/main/webapp-gae/WEB-INF/appengine-web.xml deleted file mode 100644 index c7143efb534..00000000000 --- a/examples/jsf/numberguess/src/main/webapp-gae/WEB-INF/appengine-web.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - weld-numberguess - 2 - - - - - - - true - - diff --git a/examples/jsf/numberguess/src/main/webapp-gae/WEB-INF/faces-config.xml b/examples/jsf/numberguess/src/main/webapp-gae/WEB-INF/faces-config.xml deleted file mode 100644 index e7ab0440be3..00000000000 --- a/examples/jsf/numberguess/src/main/webapp-gae/WEB-INF/faces-config.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - com.sun.facelets.FaceletViewHandler - - - diff --git a/examples/jsf/numberguess/src/main/webapp-gae/WEB-INF/logging.properties b/examples/jsf/numberguess/src/main/webapp-gae/WEB-INF/logging.properties deleted file mode 100644 index 37c57ada841..00000000000 --- a/examples/jsf/numberguess/src/main/webapp-gae/WEB-INF/logging.properties +++ /dev/null @@ -1,28 +0,0 @@ -# A default java.util.logging configuration. -# (All App Engine logging is through java.util.logging by default). -# -# To use this configuration, copy it into your application's WEB-INF -# folder and add the following to your appengine-web.xml: -# -# -# -# -# - -# Set the default logging level for all loggers to WARNING -.level = DEBUG - -# Set the default logging level for ORM, specifically, to WARNING -DataNucleus.JDO.level=WARNING -DataNucleus.Persistence.level=WARNING -DataNucleus.Cache.level=WARNING -DataNucleus.MetaData.level=WARNING -DataNucleus.General.level=WARNING -DataNucleus.Utility.level=WARNING -DataNucleus.Transaction.level=WARNING -DataNucleus.Datastore.level=WARNING -DataNucleus.ClassLoading.level=WARNING -DataNucleus.Plugin.level=WARNING -DataNucleus.ValueGeneration.level=WARNING -DataNucleus.Enhancer.level=WARNING -DataNucleus.SchemaTool.level=WARNING diff --git a/examples/jsf/numberguess/src/main/webapp-gae/WEB-INF/web.xml b/examples/jsf/numberguess/src/main/webapp-gae/WEB-INF/web.xml deleted file mode 100644 index 79e64abb25f..00000000000 --- a/examples/jsf/numberguess/src/main/webapp-gae/WEB-INF/web.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - Weld Numberguess example - - - org.jboss.weld.development - true - - - - javax.faces.DEFAULT_SUFFIX - .xhtml - - - - - com.sun.faces.enableMultiThreadedStartup - false - - - - - com.sun.faces.expressionFactory - com.sun.el.ExpressionFactoryImpl - - - - org.jboss.weld.environment.servlet.Listener - - - - Faces Servlet - javax.faces.webapp.FacesServlet - 1 - - - - Faces Servlet - *.jsf - - - - 10 - - - diff --git a/examples/jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml b/examples/jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml deleted file mode 100644 index 1ed506ddb7f..00000000000 --- a/examples/jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - BeanManager - - - javax.enterprise.inject.spi.BeanManager - org.jboss.weld.resources.ManagerObjectFactory - - - - - diff --git a/examples/jsf/numberguess/src/main/webapp-jetty/WEB-INF/web.xml b/examples/jsf/numberguess/src/main/webapp-jetty/WEB-INF/web.xml deleted file mode 100644 index 012719205b2..00000000000 --- a/examples/jsf/numberguess/src/main/webapp-jetty/WEB-INF/web.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - Weld Numberguess example - - - org.jboss.weld.development - true - - - - javax.faces.DEFAULT_SUFFIX - .xhtml - - - - org.jboss.weld.environment.servlet.Listener - - - - com.sun.faces.config.ConfigureListener - - - - Faces Servlet - javax.faces.webapp.FacesServlet - 1 - - - - Faces Servlet - *.jsf - - - - 10 - - - - Object factory for the CDI Bean Manager - BeanManager - javax.enterprise.inject.spi.BeanManager - - - diff --git a/examples/jsf/numberguess/src/main/webapp-tomcat/META-INF/context.xml b/examples/jsf/numberguess/src/main/webapp-tomcat/META-INF/context.xml deleted file mode 100644 index 66e5aeb833f..00000000000 --- a/examples/jsf/numberguess/src/main/webapp-tomcat/META-INF/context.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/examples/jsf/numberguess/src/jetty/resources/META-INF/beans.xml b/examples/jsf/numberguess/src/main/webapp/WEB-INF/beans.xml similarity index 100% rename from examples/jsf/numberguess/src/jetty/resources/META-INF/beans.xml rename to examples/jsf/numberguess/src/main/webapp/WEB-INF/beans.xml diff --git a/examples/jsf/permalink/README.md b/examples/jsf/permalink/README.md index c34f486df04..832fb40e618 100644 --- a/examples/jsf/permalink/README.md +++ b/examples/jsf/permalink/README.md @@ -28,66 +28,17 @@ To run functional tests execute: mvn verify -Darquillian=wildfly-managed-8 -Deploying to GlassFish ----------------------- -Firstly, verify that the `GLASSFISH_HOME` environment variable points to your -GlassFish installation. - -Then, create a new domain for the application: - - mvn glassfish:create-domain - -Finally, deploy the application using: - - mvn package glassfish:deploy - -The application becomes available at . - -Deploying to standalone Tomcat 7 +Deploying to standalone Tomcat 8 -------------------------------- If you want to run the application on a standalone Tomcat, first download and extract Tomcat. This build assumes you will be running Tomcat in its default -configuration, with a hostname of localhost and port 8080. Before starting -Tomcat, add the following line to `conf/tomcat-users.xml` to allow the Maven -Tomcat plugin to access the manager application, then start Tomcat: - - - -To override this username and password, add a `` with id `tomcat` in your -Maven `settings.xml` file, set the `` and `` elqements to the -appropriate values and uncomment the `` element inside the -`tomcat-maven-plugin` configuration in the `pom.xml`. - -You can deploy it as an exploded archive immediately after the war goal is -finished assembling the exploded structure: - - mvn clean compile war:exploded tomcat7:deploy -Ptomcat - -Once the application is deployed, you can redeploy it using this command: - - mvn tomcat7:redeploy -Ptomcat - -But likely you want to run one or more build goals first before you redeploy: - - mvn compile tomcat7:redeploy -Ptomcat - mvn war:exploded tomcat7:redeploy -Ptomcat - mvn compile war:exploded tomcat7:redeploy -Ptomcat - -Now you can view the application at . - -To undeploy, use: - - mvn tomcat7:undeploy -Ptomcat - -Deploying to embedded Jetty ---------------------------- -Simply run: - - mvn war:inplace jetty:run -Pjetty - -The application will be running at . +configuration, with a hostname of localhost and port 8080. Build example using +command + + mvn clean package -Ptomcat + +and deploy created WAR to Tomcat. -NOTE: This configuration currently does not work on Maven 3.1.x due to class loading conflicts regarding JSR-330 Importing the project into Eclipse ---------------------------------- diff --git a/examples/jsf/permalink/pom.xml b/examples/jsf/permalink/pom.xml index fae1aead5ff..da0bfb41f4a 100644 --- a/examples/jsf/permalink/pom.xml +++ b/examples/jsf/permalink/pom.xml @@ -24,13 +24,6 @@ - 9090 - 9091 - 9190 - false - 8080 - 9090 - 9190 src/main/webapp @@ -106,8 +99,6 @@ META-INF/** WEB-INF/classes/** WEB-INF/lib/** - WEB-INF/jetty-env.xml - WEB-INF/jetty-context.xml false @@ -143,11 +134,6 @@ - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec - - org.jboss.spec.javax.faces jboss-jsf-api_2.2_spec @@ -223,146 +209,6 @@ - - - org.apache.tomcat.maven - tomcat7-maven-plugin - - /${project.build.finalName} - - - http://localhost:${tomcat.http.port}/manager/text - - - - - - - - - - jetty - - - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec - - - - org.jboss.weld.servlet - weld-servlet-core - test - - - - org.jboss.spec.javax.faces - jboss-jsf-api_2.2_spec - - - - com.sun.faces - jsf-impl - test - - - - org.jboss.weld - weld-core-impl - test - - - - org.jboss.weld - weld-core-jsf - test - - - - org.glassfish.web - el-impl - test - - - - org.jboss.spec.javax.transaction - jboss-transaction-api_1.2_spec - - - - javax.validation - validation-api - - - - org.hibernate - hibernate-validator - 4.0.0.GA - test - - - javax.xml.bind - jaxb-api - - - com.sun.xml.bind - jaxb-impl - - - - - - - - - src/log/resources - - - src/main/resources - - - src/main/resources-jetty - - - - - org.mortbay.jetty - jetty-maven-plugin - ${jetty.version} - - - - ${jetty.http.port} - 3600000 - - - ${jetty.daemon} - ${jetty.stop.port} - HASTA_LA_VISTA - 10 - - /${project.build.finalName} - src/main/webapp-jetty/WEB-INF/override-web.xml - src/main/webapp-jetty/WEB-INF/jetty-env.xml - - src/main/webapp-jetty/WEB-INF/jetty-context.xml - - - - org.apache.maven.plugins - maven-war-plugin - - - - src/main/webapp-jetty - false - - - - @@ -433,10 +279,6 @@ - - arquillian-jetty-embedded-7 - - arquillian-wildfly-managed-8 diff --git a/examples/jsf/permalink/src/ftest/resources/arquillian.xml b/examples/jsf/permalink/src/ftest/resources/arquillian.xml index 9e9f4ffa041..b57f1e7203a 100644 --- a/examples/jsf/permalink/src/ftest/resources/arquillian.xml +++ b/examples/jsf/permalink/src/ftest/resources/arquillian.xml @@ -11,13 +11,4 @@ - - - true - - - - - - diff --git a/examples/jsf/permalink/src/glassfish/password_file b/examples/jsf/permalink/src/glassfish/password_file deleted file mode 100644 index 908d6b8a741..00000000000 --- a/examples/jsf/permalink/src/glassfish/password_file +++ /dev/null @@ -1,3 +0,0 @@ -AS_MASTER_PASSWORD=admin -AS_ADMIN_PASSWORD=admin -AS_ADMIN_USERPASSWORD=admin diff --git a/examples/jsf/permalink/src/main/resources-jetty/META-INF/beans.xml b/examples/jsf/permalink/src/main/resources-jetty/META-INF/beans.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/examples/jsf/permalink/src/main/webapp-jetty/WEB-INF/jetty-env.xml b/examples/jsf/permalink/src/main/webapp-jetty/WEB-INF/jetty-env.xml deleted file mode 100644 index 365a30e5c39..00000000000 --- a/examples/jsf/permalink/src/main/webapp-jetty/WEB-INF/jetty-env.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - BeanManager - - - javax.enterprise.inject.spi.BeanManager - org.jboss.weld.resources.ManagerObjectFactory - - - - - diff --git a/examples/jsf/permalink/src/main/webapp-jetty/WEB-INF/override-web.xml b/examples/jsf/permalink/src/main/webapp-jetty/WEB-INF/override-web.xml deleted file mode 100644 index 6218e7ccd1f..00000000000 --- a/examples/jsf/permalink/src/main/webapp-jetty/WEB-INF/override-web.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - org.jboss.weld.environment.servlet.Listener - - - diff --git a/examples/jsf/permalink/src/main/webapp-jetty/WEB-INF/web.xml b/examples/jsf/permalink/src/main/webapp-jetty/WEB-INF/web.xml deleted file mode 100644 index 772679d4b1b..00000000000 --- a/examples/jsf/permalink/src/main/webapp-jetty/WEB-INF/web.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - Weld Permalink Example (Servlet Environment) - - - org.jboss.weld.environment.servlet.Listener - - - - com.sun.faces.config.ConfigureListener - - - - org.jboss.weld.development - true - - - - facelets.DEVELOPMENT - true - - - - Faces Servlet - javax.faces.webapp.FacesServlet - 1 - - - - Faces Servlet - *.jsf - - - - 10 - - - diff --git a/examples/jsf/translator/ear/src/glassfish/password_file b/examples/jsf/translator/ear/src/glassfish/password_file deleted file mode 100644 index 908d6b8a741..00000000000 --- a/examples/jsf/translator/ear/src/glassfish/password_file +++ /dev/null @@ -1,3 +0,0 @@ -AS_MASTER_PASSWORD=admin -AS_ADMIN_PASSWORD=admin -AS_ADMIN_USERPASSWORD=admin diff --git a/examples/pom.xml b/examples/pom.xml index 51d01661430..490b15706eb 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -106,14 +106,10 @@ 2.1 1.1.15 - 7.0.53 - 8.1.13.v20130916 1.0.1.Final - 2.1 2.2 src/ftest/java src/ftest/resources - ${env.GLASSFISH_HOME} @@ -125,48 +121,12 @@ ${jsf.version} - - org.eclipse.jetty - jetty-plus - ${jetty.version} - - - - org.eclipse.jetty - jetty-jndi - ${jetty.version} - - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - - org.glassfish.web el-impl ${uel.version} - - org.apache.tomcat - catalina - ${tomcat.version} - - - - org.apache.tomcat - jasper - ${tomcat.version} - - - - org.apache.tomcat - coyote - ${tomcat.version} - - org.jboss.arquillian arquillian-bom @@ -240,42 +200,6 @@ wildfly-maven-plugin ${wildfly.plugin.version} - - org.glassfish.maven.plugin - maven-glassfish-plugin - ${glassfish.plugin.version} - - admin - ${project.basedir}/src/glassfish/password_file - true - ${glassfish.home} - - ${project.artifactId} - 4848 - 7070 - 8443 - 3700 - 7676 - false - - - - ${project.artifactId} - ${project.build.directory}/${project.build.finalName}.${project.packaging} - - - - - - org.apache.tomcat.maven - tomcat6-maven-plugin - 2.1 - - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.1 - @@ -398,103 +322,6 @@ - - arquillian-tomcat-embdedded-7 - - - arquillian - tomcat-embedded-7 - - - - - org.jboss.arquillian.container - arquillian-tomcat-embedded-7 - test - - - - org.jboss.shrinkwrap.descriptors - shrinkwrap-descriptors-impl - test - - - - org.apache.tomcat.embed - tomcat-embed-jasper - ${tomcat.version} - test - - - - org.apache.tomcat.embed - tomcat-embed-logging-juli - ${tomcat.version} - test - - - - - - - arquillian-jetty-embedded-7 - - - arquillian - jetty-embedded-7 - - - - - - org.jboss.arquillian.container - arquillian-jetty-embedded-7 - test - - - - org.jboss.shrinkwrap.descriptors - shrinkwrap-descriptors-impl - test - - - - org.eclipse.jetty - jetty-plus - test - - - - org.eclipse.jetty - jetty-jndi - test - - - - org.eclipse.jetty - jetty-webapp - test - - - - org.glassfish.web - el-impl - runtime - - - javax.el - el-api - - - - - javax.servlet.jsp - jsp-api - test - - - - arquillian-wildfly-cluster-8 diff --git a/examples/webstart/README.md b/examples/webstart/README.md index c1ada69e9f9..ecf3d40248a 100644 --- a/examples/webstart/README.md +++ b/examples/webstart/README.md @@ -11,7 +11,7 @@ Running the Example in `examples/se/numberguess` is built. If not, run `mvn clean install` in `examples/se/numberguess` -- Build and run the launcher applicationby running `mvn clean jetty:run-war` in this +- Build and run the launcher application by running `mvn clean jetty:run-war` in this directory. This will build the application and start a Jetty server hosting the application. Alternatively, you can deploy the `weld-se-numberguess-webstart.war` to any other Servlet container. diff --git a/examples/webstart/pom.xml b/examples/webstart/pom.xml index 4eab5ec5741..f012615a002 100644 --- a/examples/webstart/pom.xml +++ b/examples/webstart/pom.xml @@ -11,7 +11,7 @@ 1.0-beta-2 - 1.0-6.0.02_ea_b02.2 + 1.0-beta-7 @@ -81,7 +81,7 @@ - org.codehaus.mojo.webstart + org.codehaus.mojo webstart-jnlp-servlet ${webstart.jnlp.servlet.version} diff --git a/pom.xml b/pom.xml index 5b6feb49c77..96c0c0ec3e1 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 2.1.0.CR1 2.0.0.Beta4 1.0.1.Final - 1.0.0.CR6 + 1.0.0.CR8 1.0.0.CR2 1.0.0.CR1 1