Renamed jboss -> wildfly configuration, remade jboss->wildfly conf,

hopefully fixed openshift configuration, updated travis.yml and pom.xml
oskopek · Jan 4, 2014 · 69cf3a0 · 69cf3a0
1 parent bd25618
commit 69cf3a0
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 28 deletions.
diff --git a/.openshift/config/standalone.xml b/.openshift/config/standalone.xml
@@ -28,6 +28,8 @@
         <extension module="org.wildfly.extension.io" />
         <extension module="org.wildfly.extension.undertow" />
     </extensions>
+
+
     <management>
         <security-realms>
             <security-realm name="ManagementRealm">
@@ -54,7 +56,7 @@
                 <json-formatter name="json-formatter" />
             </formatters>
             <handlers>
-                <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log" />
+                <file-handler name="file" formatter="json-formatter" path="audit-log.log" relative-to="jboss.server.data.dir" />
             </handlers>
             <logger log-boot="true" log-read-only="false" enabled="false">
                 <handlers>
@@ -80,6 +82,7 @@
             </role-mapping>
         </access-control>
     </management>
+
     <profile>
         <subsystem xmlns="urn:jboss:domain:logging:2.0">
             <console-handler name="CONSOLE">
@@ -223,6 +226,10 @@
                     <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default"
                         use-transaction-setup-provider="true" />
                 </context-services>
+                <managed-thread-factories>
+                    <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default"
+                        context-service="default" />
+                </managed-thread-factories>
                 <managed-executor-services>
                     <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default"
                         context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000" />
@@ -232,10 +239,6 @@
                         jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000"
                         core-threads="2" keepalive-time="3000" />
                 </managed-scheduled-executor-services>
-                <managed-thread-factories>
-                    <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default"
-                        context-service="default" />
-                </managed-thread-factories>
             </concurrent>
             <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS"
                 jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default"
@@ -259,7 +262,7 @@
             </pools>
             <caches>
                 <cache name="simple" />
-                <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan" />
+                <cache name="distributable" passivation-store-ref="infinispan" aliases="passivating clustered" />
             </caches>
             <passivation-stores>
                 <passivation-store name="infinispan" cache-container="ejb" max-size="10000" />
@@ -293,7 +296,8 @@
                     <file-store passivation="false" purge="false" />
                 </local-cache>
             </cache-container>
-            <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
+            <cache-container name="ejb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan"
+                aliases="sfsb">
                 <local-cache name="passivation" batching="true">
                     <file-store passivation="true" purge="false" />
                 </local-cache>
@@ -372,6 +376,16 @@
                         </login-module>
                     </authentication>
                 </security-domain>
+                <security-domain name="other" cache-type="default">
+                    <authentication>
+                        <login-module code="Remoting" flag="optional">
+                            <module-option name="password-stacking" value="useFirstPass" />
+                        </login-module>
+                        <login-module code="RealmDirect" flag="required">
+                            <module-option name="password-stacking" value="useFirstPass" />
+                        </login-module>
+                    </authentication>
+                </security-domain>
                 <security-domain name="jboss-web-policy" cache-type="default">
                     <authorization>
                         <policy-module code="Delegating" flag="required" />
@@ -394,7 +408,7 @@
             <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager" />
             <coordinator-environment default-timeout="300" />
         </subsystem>
-	<!--        <subsystem xmlns="urn:jboss:domain:undertow:1.0">
+        <subsystem xmlns="urn:jboss:domain:undertow:1.0">
             <buffer-caches>
                 <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10" />
             </buffer-caches>
@@ -411,7 +425,7 @@
             <handlers>
                 <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true" />
             </handlers>
-    </subsystem> -->
+        </subsystem>
         <subsystem xmlns="urn:jboss:domain:webservices:1.2">
             <modify-wsdl-address>true</modify-wsdl-address>
             <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
@@ -425,6 +439,7 @@
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:weld:2.0" />
     </profile>
+
     <interfaces>
         <interface name="management">
             <inet-address value="${jboss.bind.address.management:127.0.0.1}" />
@@ -441,6 +456,7 @@
             <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}" />
         </interface>
     </interfaces>
+
     <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
         <socket-binding name="management-native" interface="management" port="${jboss.management.native.port:9999}" />
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}" />
@@ -454,4 +470,5 @@
             <remote-destination host="localhost" port="25" />
         </outbound-socket-binding>
     </socket-binding-group>
+
 </server>
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ jdk:
 
 env:
   global:
-    - WILDFLY="8.0.0.Beta1"
+    - WILDFLY="8.0.0.CR1"
     - JBOSS_HOME=$HOME/wildfly-$WILDFLY
     - secure: WrQYhD3HBLqpKj83AxUH+Gf1EL1vlAX/kcfTAMPSJdjyIcYR/U1b0BYl9ne8Glro8UopZrH8X+3I0oP6GXXG7ihnb8L2sawCutC9EyccQOvFcfuMttSMhTpJpnLSLqEw5Gdp3qb4WDHOFALfo0G4hd/Yr2iIxSp/x6DQAuIz76M=
 
@@ -21,7 +21,7 @@ before_script:
   - wget http://download.jboss.org/wildfly/$WILDFLY/wildfly-$WILDFLY.tar.gz
   - tar xfz wildfly-$WILDFLY.tar.gz
   - cd $ROOT_DIR
-  - cp carcv-webapp/src/test/resources/jboss_configuration_standalone/standalone.xml $JBOSS_HOME/standalone/configuration/standalone.xml
+  - cp carcv-webapp/src/test/resources/wildfly_configuration_standalone/standalone.xml $JBOSS_HOME/standalone/configuration/standalone.xml
 
 script: "mvn clean verify -Pwildfly-it-travis"
 

diff --git a/carcv-webapp/pom.xml b/carcv-webapp/pom.xml
@@ -23,6 +23,7 @@
         <version.arquillian>1.1.2.Final</version.arquillian>
         <version.shrinkwrap.resolvers>2.1.0-alpha-1</version.shrinkwrap.resolvers>
 
+        <version.wildfly>8.0.0.CR1</version.wildfly>
         <skipTests>false</skipTests>
 		<!-- <skipITs>${skipTests}</skipITs> -->
         <skipITs>true</skipITs>
@@ -351,13 +352,14 @@
                 <dependency>
                     <groupId>org.wildfly</groupId>
                     <artifactId>wildfly-arquillian-common</artifactId>
-                    <version>8.0.0.Beta1</version>
+                    <version>${version.wildfly}</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.wildfly</groupId>
                     <artifactId>wildfly-arquillian-container-managed</artifactId>
-                    <version>8.0.0.Beta1</version>
+                    <version>${version.wildfly}</version>
+                    <scope>test</scope>
                 </dependency>
             </dependencies>
         </profile>
@@ -389,13 +391,14 @@
                 <dependency>
                     <groupId>org.wildfly</groupId>
                     <artifactId>wildfly-arquillian-common</artifactId>
-                    <version>8.0.0.Beta1</version>
+                    <version>${version.wildfly}</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.wildfly</groupId>
                     <artifactId>wildfly-arquillian-container-managed</artifactId>
-                    <version>8.0.0.Beta1</version>
+                    <version>${version.wildfly}</version>
+                    <scope>test</scope>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/...s_configuration_standalone/standalone.xml → ...y_configuration_standalone/standalone.xml b/...s_configuration_standalone/standalone.xml → ...y_configuration_standalone/standalone.xml
@@ -99,6 +99,15 @@
                 <suffix value=".yyyy-MM-dd" />
                 <append value="true" />
             </periodic-rotating-file-handler>
+            <periodic-rotating-file-handler name="CARCV">
+                <level name="DEBUG" />
+                <formatter>
+                    <named-formatter name="COLOR-PATTERN" />
+                </formatter>
+                <file relative-to="jboss.server.log.dir" path="carcv.log" />
+                <suffix value=".yyyy-MM-dd" />
+                <append value="true" />
+            </periodic-rotating-file-handler>
             <logger category="com.arjuna">
                 <level name="WARN" />
             </logger>
@@ -117,10 +126,16 @@
             <logger category="jacorb.config">
                 <level name="ERROR" />
             </logger>
+            <logger category="org.carcv" use-parent-handlers="false">
+                <level name="DEBUG" />
+                <handlers>
+                    <handler name="CARCV" />
+                </handlers>
+            </logger>
             <root-logger>
                 <level name="INFO" />
                 <handlers>
-                    <handler name="CONSOLE" />
+					<!--handler name="CONSOLE"/ -->
                     <handler name="FILE" />
                 </handlers>
             </root-logger>
@@ -158,12 +173,13 @@
                 </drivers>
             </datasources>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1">
+        <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
             <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" />
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:ee:2.0">
             <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
             <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
+            <ejb-annotation-property-replacement>false</ejb-annotation-property-replacement>
             <concurrent>
                 <context-services>
                     <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default"
@@ -204,11 +220,11 @@
                 </bean-instance-pools>
             </pools>
             <caches>
-                <cache name="simple" aliases="NoPassivationCache" />
-                <cache name="passivating" passivation-store-ref="file" aliases="SimpleStatefulCache" />
+                <cache name="simple" />
+                <cache name="distributable" passivation-store-ref="infinispan" aliases="passivating clustered" />
             </caches>
             <passivation-stores>
-                <file-passivation-store name="file" />
+                <passivation-store name="infinispan" cache-container="ejb" max-size="10000" />
             </passivation-stores>
             <async thread-pool-name="default" />
             <timer-service thread-pool-name="default" default-data-store="default-file-store">
@@ -231,9 +247,20 @@
             <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128" />
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
-            <cache-container name="web" aliases="standard-session-cache" default-cache="local-web"
-                module="org.wildfly.clustering.web.infinispan">
-                <local-cache name="local-web" batching="true">
+            <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
+                <local-cache name="passivation" batching="true">
+                    <file-store passivation="true" purge="false" />
+                </local-cache>
+                <local-cache name="persistent" batching="true">
+                    <file-store passivation="false" purge="false" />
+                </local-cache>
+            </cache-container>
+            <cache-container name="ejb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan"
+                aliases="sfsb">
+                <local-cache name="passivation" batching="true">
+                    <file-store passivation="true" purge="false" />
+                </local-cache>
+                <local-cache name="persistent" batching="true">
                     <file-store passivation="false" purge="false" />
                 </local-cache>
             </cache-container>
@@ -284,8 +311,8 @@
             <jpa default-datasource="" default-extended-persistence-inheritance="DEEP" />
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jsf:1.0" />
-        <subsystem xmlns="urn:jboss:domain:mail:1.1">
-            <mail-session jndi-name="java:jboss/mail/Default">
+        <subsystem xmlns="urn:jboss:domain:mail:2.0">
+            <mail-session name="default" jndi-name="java:jboss/mail/Default">
                 <smtp-server outbound-socket-binding-ref="mail-smtp" />
             </mail-session>
         </subsystem>
@@ -345,14 +372,14 @@
                 <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10" />
             </buffer-caches>
             <server name="default-server">
-                <http-listener name="default" max-post-size="10485760" socket-binding="http" />
+                <http-listener name="default" socket-binding="http" />
                 <host name="default-host" alias="localhost">
                     <location name="/" handler="welcome-content" />
                 </host>
             </server>
             <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
                 <jsp-config />
-                <persistent-sessions path="persistent-web-sessions" relative-to="jboss.server.data.dir" />
+                <persistent-sessions />
             </servlet-container>
             <handlers>
                 <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true" />
@@ -379,7 +406,12 @@
         <interface name="public">
             <inet-address value="${jboss.bind.address:127.0.0.1}" />
         </interface>
+        <!-- TODO - only show this if the jacorb subsystem is added  -->
         <interface name="unsecure">
+            <!--
+              ~  Used for IIOP sockets in the standard configuration.
+              ~                  To secure JacORB you need to setup SSL 
+              -->
             <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}" />
         </interface>
     </interfaces>
@@ -398,4 +430,4 @@
         </outbound-socket-binding>
     </socket-binding-group>
 
-</server>
+</server>