iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
# Conflicts:
#	ejb/ejb-client/pom.xml
#	ejb/ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java
#	ejb/ejb-client/src/main/resources/jboss-ejb-client.properties
#	ejb/ejb-remote/pom.xml
#	ejb/ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java
#	ejb/pom.xml
This commit is contained in:
Pritam Banerjee
2016-11-15 23:22:27 -08:00
parent b1d5ae8c3c 4681d3d172
commit 16b6ae9dd1
156 changed files with 5051 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ejb/ejb-client/pom.xml
+33 -14
View File
@@ -10,19 +10,38 @@
<artifactId>ejb-client</artifactId>
<name>EJB3 Client Maven</name>
<description>EJB3 Client Maven</description>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-ejb-client-bom</artifactId>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.baeldung.ejb</groupId>
<artifactId>ejb-remote</artifactId>
<type>ejb</type>
</dependency>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-ejb-client-bom</artifactId>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.baeldung.ejb</groupId>
<artifactId>ejb-remote</artifactId>
<type>ejb</type>
</dependency>
</dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<excludes>
<exclude>**/*EJBSetupTest.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</project>
ejb/ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java
+2 -2
View File
@@ -55,8 +55,8 @@ public class EJBClient {
prop.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming");
prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
prop.put(Context.PROVIDER_URL, "http-remoting://127.0.0.1:8080");
prop.put(Context.SECURITY_PRINCIPAL, "pritamtest");
prop.put(Context.SECURITY_CREDENTIALS, "iamtheki9g");
prop.put(Context.SECURITY_PRINCIPAL, "testUser");
prop.put(Context.SECURITY_CREDENTIALS, "admin1234!");
prop.put("jboss.naming.client.ejb.context", false);
context = new InitialContext(prop);
ejb/ejb-client/src/main/resources/jboss-ejb-client.properties
+2 -2
View File
@@ -4,5 +4,5 @@ remote.connection.default.port=8080
remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
remote.connection.default.connect.options.org.xnio.Options.SASL_DISALLOWED_MECHANISMS=${host.auth:JBOSS-LOCAL-USER}
remote.connection.default.username=pritamtest
remote.connection.default.password=iamtheki9g
remote.connection.default.username=testUser
remote.connection.default.password=admin1234!
ejb/ejb-remote/pom.xml
+2 -2
View File
@@ -29,8 +29,8 @@
<configuration>
<hostname>127.0.0.1</hostname>
<port>9990</port>
<username>pritamtest</username>
<password>iamtheki9g</password>
<username>testUser</username>
<password>admin1234!</password>
<filename>${build.finalName}.jar</filename>
</configuration>
</plugin>
ejb/ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java
+1
View File
@@ -15,4 +15,5 @@ public class HelloWorldBean implements HelloWorld {
return "Welcome to EJB Tutorial!";
}
}