Permalink
Browse files

JDF-841 - Synchronize Wildfly and EAP Quickstarts

  • Loading branch information...
1 parent 02d2ea2 commit ff10170902bbdc4a775a4ddea1cd0b370b1cd274 @rafabene rafabene committed Sep 9, 2015
Showing 1,555 changed files with 123,414 additions and 28,602 deletions.
View
@@ -17,6 +17,9 @@ RELEASE_PROCEDURE.html
helloworld-gwt/src/main/gwt-unitCache
helloworld-gwt/src/main/webapp/HelloWorldApp
helloworld-gwt/src/main/webapp/WEB-INF/deploy
+helloworld-errai/src/main/gwt-unitCache
+helloworld-errai/src/main/webapp/HelloWorldApp
+helloworld-errai/src/main/webapp/WEB-INF/deploy
out
.idea
*.ipr
@@ -27,6 +30,7 @@ atlassian-ide-plugin.xml
.project
.settings
.metadata
+.factorypath
bin
.nbattrs
*.log
View
@@ -0,0 +1,3 @@
+template
+jdg-quickstarts
+jpp-quickstarts
View
@@ -1,6 +1,6 @@
====
JBoss, Home of Professional Open Source
- Copyright 2013, Red Hat, Inc. and/or its affiliates, and individual
+ Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual
contributors by the @authors tag. See the copyright.txt in the
distribution for a full listing of individual contributors.
View
Oops, something went wrong.
@@ -57,7 +57,7 @@ Then just run
Publishing builds to Maven
--------------------------
- 1. You must have gpg set up and your key registered, as described at <http://www.sonatype.com/people/2010/01/how-to-generate-pgp-signatures-with-maven/>
+ 1. You must have gpg set up and your key registered, as described at <hhttp://blog.sonatype.com/people/2010/01/how-to-generate-pgp-signatures-with-maven/>
2. You must provide a property `gpg.passphrase` in your `settings.xml` in the `release` profile e.g.
<profile>
@@ -74,7 +74,7 @@ Publishing builds to Maven
<password>myPassword</password>
</server>
- 4. Add `org.sonatype.plugins` plugin group to your `settings.xml` so nexus plugin can be available for publishing scripts.
+ 4. Add `org.sonatype.plugins` plug-in group to your `settings.xml` so the Nexus plug-in can be available for publishing scripts.
<pluginGroups>
<pluginGroup>org.sonatype.plugins</pluginGroup>
View
Oops, something went wrong.
@@ -1,30 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- JBoss, Home of Professional Open Source Copyright 2012, Red Hat, Inc.
- and/or its affiliates, and individual contributors by the @authors tag. See
- the copyright.txt in the distribution for a full listing of individual contributors.
- Licensed under the Apache License, Version 2.0 (the "License"); you may not
- use this file except in compliance with the License. You may obtain a copy
- of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual
+ contributors by the @authors tag. See the copyright.txt in the
+ distribution for a full listing of individual contributors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<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>
<parent>
<groupId>org.wildfly.quickstarts</groupId>
- <artifactId>wildfly-application-client</artifactId>
+ <artifactId>wildfly-app-client</artifactId>
<version>10.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
- <artifactId>wildfly-application-client-acc-simple</artifactId>
+ <artifactId>wildfly-app-client-client-simple</artifactId>
<packaging>jar</packaging>
- <name>WildFly Quickstart: applicationclient - client main</name>
-
+ <name>WildFly Quickstart: app-client - client-simple</name>
<url>http://wildfly.org</url>
+
<licenses>
<license>
<name>Apache License, Version 2.0</name>
@@ -33,27 +37,23 @@
</license>
</licenses>
-
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-ejb-client-bom</artifactId>
- <version>${version.wildfly}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wildfly.quickstarts</groupId>
- <artifactId>wildfly-application-client-ejb</artifactId>
+ <artifactId>wildfly-app-client-ejb</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.annotation</groupId>
- <artifactId>jboss-annotations-api_1.2_spec</artifactId>
- <version>1.0.0.Final</version>
- </dependency>
</dependencies>
+
<build>
+ <!-- Specify the artifact name -->
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -72,4 +72,3 @@
</plugins>
</build>
</project>
-
@@ -1,15 +1,15 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2014, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
+ * Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
* distribution for a full listing of individual contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
@@ -18,10 +18,7 @@
import java.util.Arrays;
-import javax.annotation.Resource;
import javax.ejb.EJB;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
import org.jboss.as.quickstarts.appclient.acc.client.interceptor.ClientInterceptor;
import org.jboss.as.quickstarts.appclient.server.ejb.StatelessSession;
@@ -31,43 +28,33 @@
/**
* A simple EJB client to demonstrate the use of the JBoss application container
* to show that the injection will work for server EJB-beans.
- *
+ *
* @author <a href="mailto:wfink@redhat.com">Wolf-Dieter Fink</a>
*/
public class Main {
private static final Logger LOG = Logger.getLogger(Main.class);
-
+
/**
- * <p>According to the JavaEE Platform specification (EE7 JSR342 - chapter EE5.16)
- * the container must provide the following boolean property as <code>TRUE</code>
- * if this client runs in an ApplicationClientContainer.<br/>
- * If running in a Web or EJB container the property is <code>FALSE</code>.</p>
- * <p>Can be used to ensure that the Injection works</p>
+ * Use field injection for the EJB reference.<br/>
+ * <b>Notice that the application-container injection only works for
+ * static fields within the main class of the application</b><br/>
+ * See JSR 342 (EE7 platform spec) chapter 5.2.5 .
*/
- @Resource(lookup = "java:comp/InAppClientContainer")
- private static boolean isInAppclient;
@EJB
private static StatelessSession slsb;
-
/** no instance necessary */
private Main() {
}
/**
* @param args the command line arguments
- * @throws NamingException
*/
- public static void main(String args[]) throws NamingException {
+ public static void main(String args[]) {
// Show that the client is started with arguments at command line
- LOG.info("Main started " + ( args.length != 0 ? "with" : "without") + " arguments");
- if(args.length > 0) LOG.info(" " + Arrays.asList(args));
-
- // ensure that the program is running in an AppClientContainer
- // the value might be NULL if we are running as a simple Java program
- if(!Boolean.TRUE.equals(isInAppclient)) {
- throw new RuntimeException("Not running in an Application Client Container");
- }
+ LOG.info("Main started " + (args.length != 0 ? "with" : "without") + " arguments");
+ if (args.length > 0)
+ LOG.info(" " + Arrays.asList(args));
// add an client side interceptor to provide the client machine name to the server application
EJBClientContext.getCurrent().registerInterceptor(0, new ClientInterceptor());
@@ -1,15 +1,15 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2014, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
+ * Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
* distribution for a full listing of individual contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
@@ -24,7 +24,7 @@
/**
* Example of an interceptor at client side which can be configures with the {@link EJBClientContext#registerInterceptor(int
* priority, new ClientInterceptor())}.
- *
+ *
* @author <a href="mailto:wfink@redhat.com">Wolf-Dieter Fink</a>
*/
public class ClientInterceptor implements EJBClientInterceptor {
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application-client version="6" 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/application-client_6.xsd">
- <display-name>SimpleApplicationClient</display-name>
-</application-client>
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
JBoss, Home of Professional Open Source
- Copyright 2013, Red Hat, Inc. and/or its affiliates, and individual
+ Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual
contributors by the @authors tag. See the copyright.txt in the
distribution for a full listing of individual contributors.
@@ -20,43 +20,37 @@
<parent>
<groupId>org.wildfly.quickstarts</groupId>
- <artifactId>wildfly-application-client</artifactId>
+ <artifactId>wildfly-app-client</artifactId>
<version>10.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>wildfly-application-client-ear</artifactId>
+ <artifactId>wildfly-app-client-ear</artifactId>
<packaging>ear</packaging>
- <name>WildFly Quickstart: applicationclient - server - app - ear</name>
+ <name>WildFly Quickstart: app-client - ear</name>
<description>Create the deployable application archive
- Include the EJB and client application together with the necessary API libraries
+ Include the EJB and client application together with the necessary API libraries
</description>
+
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<distribution>repo</distribution>
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
</license>
</licenses>
+
<dependencies>
<!-- add the EJB and WEB project as dependency to include it in the EAR -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>wildfly-application-client-ejb</artifactId>
+ <artifactId>wildfly-app-client-ejb</artifactId>
<type>ejb</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-ejb-client-bom</artifactId>
- <version>${version.wildfly}</version>
- <scope>provided</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>wildfly-application-client-acc-simple</artifactId>
- <version>${project.version}</version>
- <type>app-client</type>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wildfly-app-client-client-simple</artifactId>
+ <version>${project.version}</version>
+ <type>app-client</type>
</dependency>
</dependencies>
@@ -75,17 +69,17 @@
<version>${ear.plugin.version}</version>
<configuration>
<displayName>SimpleApplicationForApplicationClient</displayName>
- <version>7</version>
+ <version>6</version>
<generateApplicationXml>true</generateApplicationXml>
<modules>
<ejbModule>
<groupId>${project.groupId}</groupId>
- <artifactId>wildfly-application-client-ejb</artifactId>
+ <artifactId>wildfly-app-client-ejb</artifactId>
<bundleFileName>ejb.jar</bundleFileName>
</ejbModule>
<appClientModule>
<groupId>${project.groupId}</groupId>
- <artifactId>wildfly-application-client-acc-simple</artifactId>
+ <artifactId>wildfly-app-client-client-simple</artifactId>
<bundleFileName>simpleClient.jar</bundleFileName>
</appClientModule>
</modules>
@@ -94,7 +88,7 @@
</archive>
</configuration>
</plugin>
- <!-- JBoss AS plugin to deploy ear -->
+ <!-- WildFly plug-in to deploy ear -->
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
JBoss, Home of Professional Open Source
- Copyright 2013, Red Hat, Inc. and/or its affiliates, and individual
+ Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual
contributors by the @authors tag. See the copyright.txt in the
distribution for a full listing of individual contributors.
@@ -17,12 +17,17 @@
-->
<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>
+
<parent>
<groupId>org.wildfly.quickstarts</groupId>
- <artifactId>wildfly-application-client</artifactId>
+ <artifactId>wildfly-app-client</artifactId>
<version>10.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
+ <artifactId>wildfly-app-client-ejb</artifactId>
+ <packaging>ejb</packaging>
+ <name>WildFly Quickstart: app-client - ejb</name>
+ <url>http://wildfly.org</url>
+
<licenses>
<license>
<name>Apache License, Version 2.0</name>
@@ -31,12 +36,6 @@
</license>
</licenses>
- <artifactId>wildfly-application-client-ejb</artifactId>
-
- <name>WildFly Quickstart: applicationclient - server - app - ejb</name>
- <url>http://wildfly.org</url>
- <packaging>ejb</packaging>
-
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
Oops, something went wrong.

0 comments on commit ff10170

Please sign in to comment.