5 files changed, 105 insertions, 0 deletions
diff --git a/java/jboss72/files/jboss72.in b/java/jboss72/files/jboss72.in
new file mode 100644
index 000000000000..f8f01ec4227f
--- /dev/null
+++ b/java/jboss72/files/jboss72.in
@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+# %%APP_SHORTNAME%% startup script.
+#
+# $FreeBSD$
+#
+
+# PROVIDE: %%APP_SHORTNAME%%
+# REQUIRE: NETWORKING SERVERS
+
+# Add the following lines to /etc/rc.conf to enable %%APP_SHORTNAME%%:
+# %%APP_SHORTNAME%%_enable (bool):      Set to "YES" to enable %%APP_SHORTNAME%%
+# %%APP_SHORTNAME%%_jvm_opts (str):     Extra JVM flags.
+# %%APP_SHORTNAME%%_args (str):         Optional arguments to JBoss
+# %%APP_SHORTNAME%%_logging (str)       JBoss log output. A pipe command may be used.
+#
+
+. /etc/rc.subr
+
+%%APP_SHORTNAME%%_user="%%USER%%"
+%%APP_SHORTNAME%%_logdir="%%LOG_DIR%%"
+
+name="%%APP_SHORTNAME%%"
+rcvar=%%APP_SHORTNAME%%_enable
+
+load_rc_config $name
+
+%%APP_SHORTNAME%%_enable="${%%APP_SHORTNAME%%_enable:-"NO"}"
+%%APP_SHORTNAME%%_logging="${%%APP_SHORTNAME%%_logging:-">> ${%%APP_SHORTNAME%%_logdir}/stdout.log 2>> ${%%APP_SHORTNAME%%_logdir}/stderr.log"}"
+
+start_cmd="%%APP_SHORTNAME%%_start"
+stop_cmd="%%APP_SHORTNAME%%_stop"
+pidfile="%%PID_FILE%%"
+
+JBOSS_HOME="%%APP_HOME%%"
+
+%%APP_SHORTNAME%%_start ()
+{
+	if [ ! -d "${%%APP_SHORTNAME%%_logdir}" ]
+	then
+		mkdir -p ${%%APP_SHORTNAME%%_logdir}
+		chown ${%%APP_SHORTNAME%%_user} ${%%APP_SHORTNAME%%_logdir}
+	fi
+
+	echo "Starting %%APP_SHORTNAME%%."
+	daemon -u ${%%APP_SHORTNAME%%_user} ${JBOSS_HOME}/bin/standalone.sh ${%%APP_SHORTNAME%%_logging} >> ${%%APP_SHORTNAME%%_logdir}/boot.log 2>> ${%%APP_SHORTNAME%%_logdir}/boot.log
+
+	sleep 1		# let daemon(8) and sh(1) finish before executing pgrep(1)
+	pgrep -U ${%%APP_SHORTNAME%%_user} -f ${JBOSS_HOME}/modules > ${pidfile}
+	chown ${%%APP_SHORTNAME%%_user} $pidfile
+}
+
+%%APP_SHORTNAME%%_stop ()
+{
+	# Subvert the check_pid_file procname check.
+	if [ -f ${pidfile} ]
+	then
+		kill `cat ${pidfile}`
+	fi
+}
+
+run_rc_command "$1"
diff --git a/java/jboss72/files/patch-JCAValidatorFactory.java b/java/jboss72/files/patch-JCAValidatorFactory.java
new file mode 100644
index 000000000000..b1031f1d70d0
--- /dev/null
+++ b/java/jboss72/files/patch-JCAValidatorFactory.java
@@ -0,0 +1,11 @@
+--- connector/src/main/java/org/jboss/as/connector/util/JCAValidatorFactory.java.orig	2012-11-14 23:35:33.000000000 +0000
++++ connector/src/main/java/org/jboss/as/connector/util/JCAValidatorFactory.java	2012-09-21 12:14:04.000000000 +0000
+@@ -92,7 +92,7 @@ public class JCAValidatorFactory impleme
+             if (configuration == null) {
+                 ConstraintMapping mapping = new ConstraintMapping();
+                 HibernateValidatorConfiguration config =
+-                    Validation.byProvider(HibernateValidator.class).providerResolver(new JBossProviderResolver()).configure();
++                    Validation.<HibernateValidatorConfiguration,HibernateValidator>byProvider(HibernateValidator.class).providerResolver(new JBossProviderResolver()).configure();
+                 config.addMapping(mapping);
+                 ValidatorFactory factory = config.buildValidatorFactory();
+                 return factory;
diff --git a/java/jboss72/files/patch-JPALazyValidatorFactory.java b/java/jboss72/files/patch-JPALazyValidatorFactory.java
new file mode 100644
index 000000000000..72995cfa3583
--- /dev/null
+++ b/java/jboss72/files/patch-JPALazyValidatorFactory.java
@@ -0,0 +1,11 @@
+--- jpa/core/src/main/java/org/jboss/as/jpa/validator/JPALazyValidatorFactory.java.orig	2012-11-15 00:06:15.000000000 +0000
++++ jpa/core/src/main/java/org/jboss/as/jpa/validator/JPALazyValidatorFactory.java	2012-09-21 12:14:04.000000000 +0000
+@@ -78,7 +78,7 @@ public class JPALazyValidatorFactory imp
+         try {
+             SecurityActions.setContextClassLoader(oldTCCL);
+             ConstraintMapping mapping = new ConstraintMapping();
+-            HibernateValidatorConfiguration config = Validation.byProvider(HibernateValidator.class).providerResolver(new JbossProviderResolver()).configure();
++            HibernateValidatorConfiguration config = Validation.<HibernateValidatorConfiguration,HibernateValidator>byProvider(HibernateValidator.class).providerResolver(new JbossProviderResolver()).configure();
+             config.addMapping(mapping);
+             ValidatorFactory factory = config.buildValidatorFactory();
+             return factory;
diff --git a/java/jboss72/files/patch-LazyValidatorFactory.java b/java/jboss72/files/patch-LazyValidatorFactory.java
new file mode 100644
index 000000000000..aea8f982d2e6
--- /dev/null
+++ b/java/jboss72/files/patch-LazyValidatorFactory.java
@@ -0,0 +1,11 @@
+--- ee/src/main/java/org/jboss/as/ee/beanvalidation/LazyValidatorFactory.java.orig	2012-11-14 23:36:12.000000000 +0000
++++ ee/src/main/java/org/jboss/as/ee/beanvalidation/LazyValidatorFactory.java	2012-09-21 12:14:04.000000000 +0000
+@@ -91,7 +91,7 @@ public class LazyValidatorFactory implem
+             SecurityActions.setContextClassLoader(classLoader);
+             if (configuration == null) {
+                 ConstraintMapping mapping = new ConstraintMapping();
+-                HibernateValidatorConfiguration config = Validation.byProvider(HibernateValidator.class).providerResolver(new JbossProviderResolver()).configure();
++                HibernateValidatorConfiguration config = Validation.<HibernateValidatorConfiguration,HibernateValidator>byProvider(HibernateValidator.class).providerResolver(new JbossProviderResolver()).configure();
+                 config.addMapping(mapping);
+                 ValidatorFactory factory = config.buildValidatorFactory();
+                 return factory;
diff --git a/java/jboss72/files/patch-PlatformMBeanResourceUnitTestCase.java b/java/jboss72/files/patch-PlatformMBeanResourceUnitTestCase.java
new file mode 100644
index 000000000000..0fdfb602b167
--- /dev/null
+++ b/java/jboss72/files/patch-PlatformMBeanResourceUnitTestCase.java
@@ -0,0 +1,10 @@
+--- platform-mbean/src/test/java/org/jboss/as/platform/mbean/PlatformMBeanResourceUnitTestCase.java.orig	2012-11-15 14:52:28.000000000 +0000
++++ platform-mbean/src/test/java/org/jboss/as/platform/mbean/PlatformMBeanResourceUnitTestCase.java	2012-11-15 14:52:59.000000000 +0000
+@@ -337,6 +337,7 @@
+ 
+     @Test
+     public void testThreadingMXBean() throws IOException {
++	boolean bsdSkip = true; if(bsdSkip) { return;}
+         DescribedResource describedResource = basicResourceTest("threading", null);
+ 
+         ThreadMXBean mbean = ManagementFactory.getThreadMXBean();