[jboss-cvs] JBossAS SVN: r106749 - in branches/Branch_No_Multicast: component-matrix and 40 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 15 10:29:31 EDT 2010
Author: pferraro
Date: 2010-07-15 10:29:25 -0400 (Thu, 15 Jul 2010)
New Revision: 106749
Added:
branches/Branch_No_Multicast/hornetq-int/src/resources/jbossts-properties.xml
branches/Branch_No_Multicast/main/src/main/org/jboss/system/security/
branches/Branch_No_Multicast/main/src/main/org/jboss/system/security/DebuggingJavaSecurityManager.java
branches/Branch_No_Multicast/security/docs/
branches/Branch_No_Multicast/security/docs/diagrams/
branches/Branch_No_Multicast/security/docs/diagrams/EAP5_SecurityModel_Interface.dia
branches/Branch_No_Multicast/security/docs/diagrams/EAP5_SecurityModel_Interface.png
branches/Branch_No_Multicast/security/src/etc/bin/password_tool.bat
branches/Branch_No_Multicast/server/src/etc/conf/all/bootstrap/security.xml
branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamDvdstoreExampleUnitTestCase.java
branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/
branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/
branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testQueue-service.xml
branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testTopic-service.xml
Removed:
branches/Branch_No_Multicast/main/src/main/org/jboss/system/security/DebuggingJavaSecurityManager.java
branches/Branch_No_Multicast/security/docs/diagrams/
branches/Branch_No_Multicast/security/docs/diagrams/EAP5_SecurityModel_Interface.dia
branches/Branch_No_Multicast/security/docs/diagrams/EAP5_SecurityModel_Interface.png
branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamDvdExampleUnitTestCase.java
branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/
branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testQueue-service.xml
branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testTopic-service.xml
Modified:
branches/Branch_No_Multicast/build/VersionRelease.java
branches/Branch_No_Multicast/build/build-distr.xml
branches/Branch_No_Multicast/build/build.xml
branches/Branch_No_Multicast/build/jbossas-5-disableauth.patch
branches/Branch_No_Multicast/build/jbossas-5-enableauth.patch
branches/Branch_No_Multicast/build/jbossas-5-ewp.patch
branches/Branch_No_Multicast/component-matrix/pom.xml
branches/Branch_No_Multicast/connector/src/etc/example-config/postgres-ds.xml
branches/Branch_No_Multicast/connector/src/etc/example-config/postgres-xa-ds.xml
branches/Branch_No_Multicast/console/build.xml
branches/Branch_No_Multicast/hornetq-int/src/etc/build.xml
branches/Branch_No_Multicast/main/build.xml
branches/Branch_No_Multicast/main/src/bin/server.policy.cert
branches/Branch_No_Multicast/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
branches/Branch_No_Multicast/profileservice/src/main/org/jboss/profileservice/web/DebugServlet.java
branches/Branch_No_Multicast/security/src/etc/deploy/security-jboss-beans.xml
branches/Branch_No_Multicast/security/src/main/org/jboss/security/auth/AuthenticationTimedCachePolicy.java
branches/Branch_No_Multicast/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java
branches/Branch_No_Multicast/security/src/main/org/jboss/security/integration/SecurityConstantsBridge.java
branches/Branch_No_Multicast/security/src/main/org/jboss/security/integration/SecurityDomainObjectFactory.java
branches/Branch_No_Multicast/security/src/main/org/jboss/security/integration/password/PasswordLifecycleCallback.java
branches/Branch_No_Multicast/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
branches/Branch_No_Multicast/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java
branches/Branch_No_Multicast/server/build.xml
branches/Branch_No_Multicast/server/src/etc/conf/all/bootstrap.xml
branches/Branch_No_Multicast/server/src/etc/conf/all/bootstrap/deployers.xml
branches/Branch_No_Multicast/server/src/etc/conf/minimal/bootstrap.xml
branches/Branch_No_Multicast/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java
branches/Branch_No_Multicast/system/src/main/org/jboss/deployers/plugins/managed/DefaultManagedObjectCreator.java
branches/Branch_No_Multicast/system/src/main/org/jboss/deployers/plugins/managed/KernelDeploymentManagedObjectCreator.java
branches/Branch_No_Multicast/system/src/main/org/jboss/system/server/profileservice/attachments/AttachmentMetaData.java
branches/Branch_No_Multicast/system/src/main/org/jboss/system/server/profileservice/persistence/deployer/PersistenceModificationChecker.java
branches/Branch_No_Multicast/system/src/main/org/jboss/system/server/profileservice/repository/AbstractAttachmentStore.java
branches/Branch_No_Multicast/system/src/main/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java
branches/Branch_No_Multicast/testsuite/build.xml
branches/Branch_No_Multicast/testsuite/imports/sections/profileservice.xml
branches/Branch_No_Multicast/testsuite/imports/sections/seam.xml
branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/deployers/test/DeploymentManagerUnitTestCase.java
branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/jca/test/BackgroundValidationUnitTestCase.java
branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/JmsDestinationRestartUnitTestCase.java
branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java
branches/Branch_No_Multicast/tools/etc/buildmagic/build-common.xml
branches/Branch_No_Multicast/varia/build.xml
Log:
Merge trunk updates into Branch_No_Multicast
Modified: branches/Branch_No_Multicast/build/VersionRelease.java
===================================================================
--- branches/Branch_No_Multicast/build/VersionRelease.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/build/VersionRelease.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -91,6 +91,7 @@
processDir(jbossHome);
try
{
+ System.out.println("VR: Creating jar-versions.xml file...");
DocumentFactory df = DocumentFactory.getInstance();
Document doc = df.createDocument();
Element root = doc.addElement("jar-versions");
@@ -98,6 +99,7 @@
while( iter.hasNext() )
{
JarInfo info = (JarInfo) iter.next();
+ System.out.println("VR: Add info for file: "+info.jarName);
info.writeXML(root);
}
@@ -130,19 +132,21 @@
}
void processFile(File file)
{
- System.out.println("Checking file: "+file);
// See if this is a jar archive
try
{
JarInfo info = new JarInfo(file, this);
+ System.out.println("VR: Checking file: "+file);
info.write(md5);
jars.add(info);
}
catch(FileNotFoundException e)
{
+ System.out.println("VR: Skipping non-JAR file: "+file);
}
catch(Exception e)
{
+ System.out.println("VR: Exception while checking file: "+file);
e.printStackTrace();
}
}
@@ -154,8 +158,10 @@
Manifest mf;
JarFile jarFile;
+ JarEntry jarSignature;
String jarName;
boolean sealed;
+ boolean signed;
String md5Digest;
String specVersion;
String specVendor;
@@ -173,7 +179,7 @@
this.jarName = file.getName();
this.tmpFile = new File(file.getAbsolutePath()+".tmp");
if( file.renameTo(tmpFile) == false )
- throw new IOException("Failed to rename: "+file);
+ throw new IOException("VR: Failed to rename: "+file);
try
{
@@ -182,15 +188,28 @@
catch(IOException e)
{
tmpFile.renameTo(file);
- throw new FileNotFoundException("Not a JarFile: "+file);
+ throw new FileNotFoundException("VR: Not a JarFile: "+file);
}
- this.mf = jarFile.getManifest();
+ try
+ {
+ this.mf = jarFile.getManifest();
+ this.jarSignature = jarFile.getJarEntry( "META-INF/JBOSSCOD.SF" );
+ }
+ catch(Exception e)
+ {
+ System.out.println("VR: Exception while getting info from file: "+file);
+ e.printStackTrace();
+ tmpFile.renameTo(file);
+ }
+
Attributes mfAttrs = mf.getMainAttributes();
String sealedAttr = mfAttrs.getValue(Attributes.Name.SEALED);
sealed = Boolean.valueOf(sealedAttr).booleanValue();
+ signed = ( jarSignature == null) ? false : true;
+
specVersion = mfAttrs.getValue(Attributes.Name.SPECIFICATION_VERSION);
if( specVersion == null )
{
@@ -246,9 +265,10 @@
throws IOException
{
md5.reset();
- if( sealed == true )
+ if( ( sealed == true ) || ( signed == true ) )
{
- System.out.println("Skipping sealed jar: "+file);
+ tmpFile.renameTo(file);
+ System.out.println("VR: Skipping sealed or signed jar: "+file);
}
else
{
Modified: branches/Branch_No_Multicast/build/build-distr.xml
===================================================================
--- branches/Branch_No_Multicast/build/build-distr.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/build/build-distr.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -981,8 +981,8 @@
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
<!-- Copy the generated libraries -->
- <mkdir dir="${install.all.lib}"/>
- <copy todir="${install.all.lib}" filtering="no">
+ <mkdir dir="${install.lib}"/>
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jbosssx-server.jar"/>
</fileset>
@@ -2022,12 +2022,6 @@
<fileset dir="${jboss.jboss.negotiation.lib}">
<include name="jboss-negotiation.jar"/>
</fileset>
- <fileset dir="${jboss.jboss.security.spi.lib}">
- <include name="jboss-security-spi.jar"/>
- </fileset>
- <fileset dir="${jboss.jbosssx.lib}">
- <include name="jbosssx.jar"/>
- </fileset>
<fileset dir="${jboss.security.lib}">
<include name="jbossxacml.jar"/>
</fileset>
@@ -2121,6 +2115,15 @@
<fileset dir="${woodstox.woodstox.lib}">
<include name="wstx.jar"/>
</fileset>
+ <fileset dir="${jboss.jboss.security.spi.lib}">
+ <include name="jboss-security-spi.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jbosssx.lib}">
+ <include name="jbosssx.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jboss.javaee.lib}">
+ <include name="jboss-javaee.jar"/>
+ </fileset>
</copy>
<!-- Copy the generated client libraries -->
@@ -2277,9 +2280,6 @@
<fileset dir="${jboss.jboss.jaspi.api.lib}">
<include name="jboss-jaspi-api.jar"/>
</fileset>
- <fileset dir="${jboss.jboss.javaee.lib}">
- <include name="jboss-javaee.jar"/>
- </fileset>
<fileset dir="${jboss.jnpserver.lib}">
<include name="jnpserver.jar"/>
</fileset>
Modified: branches/Branch_No_Multicast/build/build.xml
===================================================================
--- branches/Branch_No_Multicast/build/build.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/build/build.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -843,6 +843,11 @@
<delete dir="${install.default}/deployers/bsh.deployer"/>
<delete dir="${install.production}/deployers/bsh.deployer"/>
+ <delete dir="${install.default}/conf/props/messaging-roles.properties"/>
+ <delete dir="${install.default}/conf/props/messaging-users.properties"/>
+ <delete dir="${install.production}/conf/props/messaging-roles.properties"/>
+ <delete dir="${install.production}/conf/props/messaging-users.properties"/>
+
<!-- delete examples that make no sense for EWP (JBPAPP-3570) -->
<delete dir="${install.examples}/jms"/>
<delete dir="${install.examples}/jmx/jmx-remoting.sar"/>
@@ -997,6 +1002,7 @@
<include name="bootstrap/jmx.xml"/>
<include name="bootstrap/deployers.xml"/>
<include name="bootstrap/profile.xml"/>
+ <include name="bootstrap/security.xml"/>
<include name="xmdesc/NamingBean-xmbean.xml"/>
<include name="xmdesc/NamingService-xmbean.xml"/>
<include name="xmdesc/NamingProviderURLWriter-xmbean.xml"/>
@@ -1090,9 +1096,6 @@
<include name="deploy/cluster/jboss-cache-manager.sar/**"/>
<include name="lib/jbosscache-*"/>
<include name="lib/hibernate-jbosscache2.jar"/>
- <include name="lib/hibernate-ehcache.jar"/>
- <include name="lib/hibernate-oscache.jar"/>
- <include name="lib/hibernate-swarmcache.jar"/>
<include name="lib/jgroups.jar"/>
</fileset>
</copy>
@@ -1110,9 +1113,15 @@
<move todir="${install.common.lib}">
<fileset dir="${install.all.lib}">
<exclude name="hibernate-jbosscache2.jar"/>
+ <!-- JBPAPP-3180. The other hibernate 2nd Level Cache integration
+ jars are allowed to move to commmon/lib because their classes
+ were available in 'default' in EAP 4.x. Having them only in
+ 'all' is an incompatibility. -->
+ <!--
<exclude name="hibernate-ehcache.jar"/>
<exclude name="hibernate-oscache.jar"/>
<exclude name="hibernate-swarmcache.jar"/>
+ -->
<exclude name="jacorb.jar"/>
<exclude name="jbosscache-core.jar"/>
<exclude name="jbosscache-pojo.jar"/>
@@ -1190,9 +1199,6 @@
<include name="deploy/cluster/jboss-cache-manager.sar/**"/>
<include name="lib/jbosscache-*"/>
<include name="lib/hibernate-jbosscache2.jar"/>
- <include name="lib/hibernate-ehcache.jar"/>
- <include name="lib/hibernate-oscache.jar"/>
- <include name="lib/hibernate-swarmcache.jar"/>
<include name="lib/jgroups.jar"/>
<exclude name="lib/bsf.jar"/>
<exclude name="lib/bsh.jar"/>
Modified: branches/Branch_No_Multicast/build/jbossas-5-disableauth.patch
===================================================================
--- branches/Branch_No_Multicast/build/jbossas-5-disableauth.patch 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/build/jbossas-5-disableauth.patch 2010-07-15 14:29:25 UTC (rev 106749)
@@ -43,7 +43,7 @@
diff -Naur ./server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml ./server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml
--- ./server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-09-08 13:43:11.000000000 -0400
+++ ./server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-09-08 13:44:31.000000000 -0400
-@@ -32,21 +32,22 @@
+@@ -32,19 +32,20 @@
<url-pattern>/pclink</url-pattern>
</servlet-mapping>
@@ -57,8 +57,6 @@
+ role 'friend' to access the JBossWS console web application
</description>
<url-pattern>/*</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
- <role-name>JBossAdmin</role-name>
@@ -69,7 +67,7 @@
<login-config>
<auth-method>BASIC</auth-method>
-@@ -54,7 +55,7 @@
+@@ -52,7 +53,7 @@
</login-config>
<security-role>
@@ -220,7 +218,7 @@
diff -Naur ./server/default/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml ./server/default/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml
--- ./server/default/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-09-08 13:43:11.000000000 -0400
+++ ./server/default/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-09-08 13:44:31.000000000 -0400
-@@ -32,21 +32,22 @@
+@@ -32,19 +32,20 @@
<url-pattern>/pclink</url-pattern>
</servlet-mapping>
@@ -234,8 +232,6 @@
+ role 'friend' to access the JBossWS console web application
</description>
<url-pattern>/*</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
- <role-name>JBossAdmin</role-name>
@@ -246,7 +242,7 @@
<login-config>
<auth-method>BASIC</auth-method>
-@@ -54,7 +55,7 @@
+@@ -52,7 +53,7 @@
</login-config>
<security-role>
@@ -397,7 +393,7 @@
diff -Naur ./server/production/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml ./server/production/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml
--- ./server/production/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-09-08 13:43:11.000000000 -0400
+++ ./server/production/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-09-08 13:44:31.000000000 -0400
-@@ -32,21 +32,22 @@
+@@ -32,19 +32,20 @@
<url-pattern>/pclink</url-pattern>
</servlet-mapping>
@@ -411,8 +407,6 @@
+ role 'friend' to access the JBossWS console web application
</description>
<url-pattern>/*</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
- <role-name>JBossAdmin</role-name>
@@ -423,7 +417,7 @@
<login-config>
<auth-method>BASIC</auth-method>
-@@ -54,7 +55,7 @@
+@@ -52,7 +53,7 @@
</login-config>
<security-role>
@@ -561,7 +555,7 @@
diff -Naur ./server/standard/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml ./server/standard/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml
--- ./server/standard/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-09-08 13:43:11.000000000 -0400
+++ ./server/standard/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-09-08 13:44:31.000000000 -0400
-@@ -32,21 +32,22 @@
+@@ -32,19 +32,20 @@
<url-pattern>/pclink</url-pattern>
</servlet-mapping>
@@ -575,8 +569,6 @@
+ role 'friend' to access the JBossWS console web application
</description>
<url-pattern>/*</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
- <role-name>JBossAdmin</role-name>
@@ -587,7 +579,7 @@
<login-config>
<auth-method>BASIC</auth-method>
-@@ -54,7 +55,7 @@
+@@ -52,7 +53,7 @@
</login-config>
<security-role>
@@ -693,7 +685,7 @@
diff -Naur ./server/web/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml ./server/web/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml
--- ./server/web/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-09-08 13:43:11.000000000 -0400
+++ ./server/web/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-09-08 13:44:31.000000000 -0400
-@@ -32,21 +32,22 @@
+@@ -32,19 +32,20 @@
<url-pattern>/pclink</url-pattern>
</servlet-mapping>
@@ -707,8 +699,6 @@
+ role 'friend' to access the JBossWS console web application
</description>
<url-pattern>/*</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
- <role-name>JBossAdmin</role-name>
@@ -719,7 +709,7 @@
<login-config>
<auth-method>BASIC</auth-method>
-@@ -54,7 +55,7 @@
+@@ -52,7 +53,7 @@
</login-config>
<security-role>
Modified: branches/Branch_No_Multicast/build/jbossas-5-enableauth.patch
===================================================================
--- branches/Branch_No_Multicast/build/jbossas-5-enableauth.patch 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/build/jbossas-5-enableauth.patch 2010-07-15 14:29:25 UTC (rev 106749)
@@ -533,7 +533,7 @@
<security-constraint>
<web-resource-collection>
<web-resource-name>ContextServlet</web-resource-name>
-@@ -47,7 +47,6 @@
+@@ -45,7 +45,6 @@
<role-name>friend</role-name>
</auth-constraint>
</security-constraint>
@@ -552,7 +552,7 @@
<security-constraint>
<web-resource-collection>
<web-resource-name>ContextServlet</web-resource-name>
-@@ -47,7 +47,6 @@
+@@ -45,7 +45,6 @@
<role-name>friend</role-name>
</auth-constraint>
</security-constraint>
@@ -571,7 +571,7 @@
<security-constraint>
<web-resource-collection>
<web-resource-name>ContextServlet</web-resource-name>
-@@ -47,7 +47,6 @@
+@@ -45,7 +45,6 @@
<role-name>friend</role-name>
</auth-constraint>
</security-constraint>
@@ -590,7 +590,7 @@
<security-constraint>
<web-resource-collection>
<web-resource-name>ContextServlet</web-resource-name>
-@@ -47,7 +47,6 @@
+@@ -45,7 +45,6 @@
<role-name>friend</role-name>
</auth-constraint>
</security-constraint>
@@ -609,7 +609,7 @@
<security-constraint>
<web-resource-collection>
<web-resource-name>ContextServlet</web-resource-name>
-@@ -47,7 +47,6 @@
+@@ -45,7 +45,6 @@
<role-name>friend</role-name>
</auth-constraint>
</security-constraint>
@@ -792,7 +792,7 @@
diff -Naur server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml
--- server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-08-28 11:04:32.000000000 -0400
+++ server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-08-28 11:05:23.000000000 -0400
-@@ -37,14 +37,14 @@
+@@ -37,12 +37,12 @@
<web-resource-collection>
<web-resource-name>ContextServlet</web-resource-name>
<description>An example security config that only allows users with the
@@ -800,8 +800,6 @@
+ role 'JBossAdmin' to access the JBossWS console web application
</description>
<url-pattern>/*</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
- <role-name>friend</role-name>
@@ -809,7 +807,7 @@
</auth-constraint>
</security-constraint>
-@@ -54,7 +54,7 @@
+@@ -52,7 +52,7 @@
</login-config>
<security-role>
@@ -821,7 +819,7 @@
diff -Naur server/default/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml server/default/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml
--- server/default/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-08-28 10:47:57.000000000 -0400
+++ server/default/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-08-28 10:49:17.000000000 -0400
-@@ -37,14 +37,14 @@
+@@ -37,12 +37,12 @@
<web-resource-collection>
<web-resource-name>ContextServlet</web-resource-name>
<description>An example security config that only allows users with the
@@ -829,8 +827,6 @@
+ role 'JBossAdmin' to access the JBossWS console web application
</description>
<url-pattern>/*</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
- <role-name>friend</role-name>
@@ -838,7 +834,7 @@
</auth-constraint>
</security-constraint>
-@@ -54,7 +54,7 @@
+@@ -52,7 +52,7 @@
</login-config>
<security-role>
@@ -850,7 +846,7 @@
diff -Naur server/production/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml server/production/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml
--- server/production/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-08-28 10:47:42.000000000 -0400
+++ server/production/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-08-28 10:49:28.000000000 -0400
-@@ -37,14 +37,14 @@
+@@ -37,12 +37,12 @@
<web-resource-collection>
<web-resource-name>ContextServlet</web-resource-name>
<description>An example security config that only allows users with the
@@ -858,8 +854,6 @@
+ role 'JBossAdmin' to access the JBossWS console web application
</description>
<url-pattern>/*</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
- <role-name>friend</role-name>
@@ -867,7 +861,7 @@
</auth-constraint>
</security-constraint>
-@@ -54,7 +54,7 @@
+@@ -52,7 +52,7 @@
</login-config>
<security-role>
@@ -879,7 +873,7 @@
diff -Naur server/standard/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml server/standard/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml
--- server/standard/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-08-28 10:48:06.000000000 -0400
+++ server/standard/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-08-28 10:49:22.000000000 -0400
-@@ -37,14 +37,14 @@
+@@ -37,12 +37,12 @@
<web-resource-collection>
<web-resource-name>ContextServlet</web-resource-name>
<description>An example security config that only allows users with the
@@ -887,8 +881,6 @@
+ role 'JBossAdmin' to access the JBossWS console web application
</description>
<url-pattern>/*</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
- <role-name>friend</role-name>
@@ -896,7 +888,7 @@
</auth-constraint>
</security-constraint>
-@@ -54,7 +54,7 @@
+@@ -52,7 +52,7 @@
</login-config>
<security-role>
@@ -908,7 +900,7 @@
diff -Naur server/web/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml server/web/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml
--- server/web/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-08-28 10:47:52.000000000 -0400
+++ server/web/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml 2009-08-28 10:43:18.000000000 -0400
-@@ -37,14 +37,14 @@
+@@ -37,12 +37,12 @@
<web-resource-collection>
<web-resource-name>ContextServlet</web-resource-name>
<description>An example security config that only allows users with the
@@ -916,8 +908,6 @@
+ role 'JBossAdmin' to access the JBossWS console web application
</description>
<url-pattern>/*</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
- <role-name>friend</role-name>
@@ -925,7 +915,7 @@
</auth-constraint>
</security-constraint>
-@@ -54,7 +54,7 @@
+@@ -52,7 +52,7 @@
</login-config>
<security-role>
Modified: branches/Branch_No_Multicast/build/jbossas-5-ewp.patch
===================================================================
--- branches/Branch_No_Multicast/build/jbossas-5-ewp.patch 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/build/jbossas-5-ewp.patch 2010-07-15 14:29:25 UTC (rev 106749)
@@ -38,26 +38,26 @@
#
-product.name=JBoss EAP Admin Console
+product.name=JBoss EWP Admin Console
- product.version=1.3.2.GA
- product.buildNumber=784
- product.copyright=© 2002-2009 Red Hat Middleware, LLC. All rights reserved. JBoss is a registered trademark of Red Hat, Inc.
+ product.version=1.3.4.CR1
+ product.buildNumber=946
+ product.copyright=© 2002-2010 Red Hat Middleware, LLC. All rights reserved. JBoss is a registered trademark of Red Hat, Inc.
-default.windowTitle=JBoss EAP Admin Console
+default.windowTitle=JBoss EWP Admin Console
- #default.header=Embedded Jopr Core
+ #default.header=Embedded Jopr
default.breadcrumb=default breadcrumb
--- server/web/deploy/admin-console.war/META-INF/maven/org.jboss.jopr/jopr-embedded-jbas5/pom.xml.orig 2010-01-22 09:39:57.000000000 -0500
+++ server/web/deploy/admin-console.war/META-INF/maven/org.jboss.jopr/jopr-embedded-jbas5/pom.xml 2010-01-22 09:39:19.000000000 -0500
-@@ -22,7 +22,7 @@
- <warDir>${basedir}/target/${project.build.finalName}</warDir>
- <warFile>${warDir}.war</warFile>
- <contextRoot>admin-console</contextRoot>
-- <product.name>JBoss EAP Admin Console</product.name>
-+ <product.name>JBoss EWP Admin Console</product.name>
- </properties>
-
- <dependencies>
+@@ -23,7 +23,7 @@
+ <warDir>${basedir}/target/${project.build.finalName}</warDir>
+ <warFile>${warDir}.war</warFile>
+ <contextRoot>admin-console</contextRoot>
+- <product.name>JBoss EAP Admin Console</product.name>
++ <product.name>JBoss EWP Admin Console</product.name>
+ </properties>
+
+ <dependencies>
diff -Naur server/web/deploy/ROOT.war/index.html server/web/deploy/ROOT.war/index.html
--- server/web/deploy/ROOT.war/index.html 2009-08-18 21:53:43.000000000 -0400
+++ server/web/deploy/ROOT.war/index.html 2009-08-19 08:07:35.000000000 -0400
Modified: branches/Branch_No_Multicast/component-matrix/pom.xml
===================================================================
--- branches/Branch_No_Multicast/component-matrix/pom.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/component-matrix/pom.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -41,9 +41,9 @@
<version.jboss.jbossws>3.1.2.SP6</version.jboss.jbossws>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
<version.jboss.messaging>1.4.6.GA_SP1</version.jboss.messaging>
- <version.hornetq>snap-r9314</version.hornetq>
- <version.jboss.web>2.1.8.GA</version.jboss.web>
- <version.jgroups>2.6.15.GA</version.jgroups>
+ <version.hornetq>2.1.1.Final</version.hornetq>
+ <version.jboss.web>2.1.9.GA</version.jboss.web>
+ <version.jgroups>2.6.16.GA</version.jgroups>
<version.junit>3.8.2</version.junit>
<version.org.hibernate.annotations>3.4.0.GA_CP02</version.org.hibernate.annotations>
<version.org.hibernate.commons.annotations>3.1.0.GA</version.org.hibernate.commons.annotations>
@@ -79,7 +79,7 @@
<version.org.jboss.microcontainer>2.0.10.GA</version.org.jboss.microcontainer>
<version.org.jboss.naming>5.0.3.GA</version.org.jboss.naming>
<version.org.jboss.reflect>2.0.3.GA</version.org.jboss.reflect>
- <version.org.jboss.remoting>2.5.2.SP3</version.org.jboss.remoting>
+ <version.org.jboss.remoting>2.5.3</version.org.jboss.remoting>
<version.org.jboss.security>2.0.4.SP4</version.org.jboss.security>
<version.org.jboss.security.negotiation>2.0.3.SP3</version.org.jboss.security.negotiation>
<version.org.jboss.threads>1.0.0.GA</version.org.jboss.threads>
@@ -2076,7 +2076,7 @@
<dependency>
<groupId>quartz</groupId>
<artifactId>quartz</artifactId>
- <version>1.5.2</version>
+ <version>1.5.2-patch-01</version>
</dependency>
<dependency>
Modified: branches/Branch_No_Multicast/connector/src/etc/example-config/postgres-ds.xml
===================================================================
--- branches/Branch_No_Multicast/connector/src/etc/example-config/postgres-ds.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/connector/src/etc/example-config/postgres-ds.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -30,7 +30,7 @@
<!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
<metadata>
- <type-mapping>PostgreSQL 7.2</type-mapping>
+ <type-mapping>PostgreSQL</type-mapping>
</metadata>
</local-tx-datasource>
Modified: branches/Branch_No_Multicast/connector/src/etc/example-config/postgres-xa-ds.xml
===================================================================
--- branches/Branch_No_Multicast/connector/src/etc/example-config/postgres-xa-ds.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/connector/src/etc/example-config/postgres-xa-ds.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -27,7 +27,7 @@
<!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
<metadata>
- <type-mapping>PostgreSQL 7.2</type-mapping>
+ <type-mapping>PostgreSQL</type-mapping>
</metadata>
</xa-datasource>
Modified: branches/Branch_No_Multicast/console/build.xml
===================================================================
--- branches/Branch_No_Multicast/console/build.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/console/build.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -321,26 +321,34 @@
</jar>
<!-- Build applet.jar -->
- <jar destfile="${build.lib}/applet.jar" excludes="META-INF/INDEX.LIST">
- <zipgroupfileset dir="${jboss.server.lib}">
- <include name="jmx-rmi-adaptor.jar"/>
- </zipgroupfileset>
- <zipgroupfileset dir="${jfreechart.jfreechart.lib}">
- <include name="jfreechart.jar"/>
- <include name="jcommon.jar"/>
- </zipgroupfileset>
+ <jar destfile="${build.lib}/applet.jar">
+ <!-- <zipfileset src="${jboss.server.lib}/jmx-rmi-adaptor.jar" /> -->
+ <zipfileset src="${jfreechart.jfreechart.lib}/jfreechart.jar">
+ <exclude name="META-INF/INDEX.LIST"/>
+ <exclude name="META-INF/JBOSSCOD.*"/>
+ </zipfileset>
+ <zipfileset src="${jfreechart.jfreechart.lib}/jcommon.jar">
+ <exclude name="META-INF/INDEX.LIST"/>
+ <exclude name="META-INF/JBOSSCOD.*"/>
+ </zipfileset>
<zipfileset src="${jboss.server.lib}/jboss-client.jar">
<include name="org/jboss/invocation/*"/>
<exclude name="META-INF/INDEX.LIST"/>
+ <exclude name="META-INF/JBOSSCOD.*"/>
</zipfileset>
<zipfileset src="${jboss.common.logging.spi.lib}/jboss-logging-spi.jar">
<include name="org/jboss/logging/**"/>
+ <exclude name="META-INF/INDEX.LIST"/>
+ <exclude name="META-INF/JBOSSCOD.*"/>
</zipfileset>
<zipfileset src="${jboss.common.logging.log4j.lib}/jboss-logging-log4j.jar">
<include name="org/jboss/logging/**"/>
+ <exclude name="META-INF/INDEX.LIST"/>
+ <exclude name="META-INF/JBOSSCOD.*"/>
</zipfileset>
<zipfileset src="${jboss.common.core.lib}/jboss-common-core.jar">
<exclude name="META-INF/INDEX.LIST"/>
+ <exclude name="META-INF/JBOSSCOD.*"/>
<exclude name="org/jboss/util/property/**"/>
<exclude name="org/jboss/util/propertyeditor/**"/>
<exclude name="org/jboss/util/state/**"/>
@@ -355,12 +363,15 @@
</zipfileset>
<zipfileset src="${jboss.system.lib}/jboss-system-client.jar">
<exclude name="META-INF/INDEX.LIST"/>
+ <exclude name="META-INF/JBOSSCOD.*"/>
</zipfileset>
<zipfileset src="${jboss.jnp.client.lib}/jnp-client.jar">
<exclude name="META-INF/INDEX.LIST"/>
+ <exclude name="META-INF/JBOSSCOD.*"/>
</zipfileset>
<zipfileset src="${jboss.jmx.lib}/jboss-jmx.jar">
<exclude name="META-INF/INDEX.LIST"/>
+ <exclude name="META-INF/JBOSSCOD.*"/>
<exclude name="org/jboss/mx/server/**"/>
<exclude name="org/jboss/mx/remote/**"/>
<exclude name="org/jboss/mx/persistence/**"/>
Modified: branches/Branch_No_Multicast/hornetq-int/src/etc/build.xml
===================================================================
--- branches/Branch_No_Multicast/hornetq-int/src/etc/build.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/hornetq-int/src/etc/build.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -30,6 +30,7 @@
<antcall target="removeConfig">
<param name="CONFIG" value="default"/>
</antcall>
+
<antcall target="createConfig">
<param name="CONFIG" value="default"/>
<param name="CONFIG_TYPE" value="non-clustered"/>
@@ -43,6 +44,15 @@
<param name="CONFIG_TYPE" value="clustered"/>
</antcall>
+ <antcall target="removeConfig">
+ <param name="CONFIG" value="production"/>
+ </antcall>
+ <antcall target="createConfig">
+ <param name="CONFIG" value="production"/>
+ <param name="CONFIG_TYPE" value="clustered"/>
+ </antcall>
+
+
</target>
<target name="removeCommon">
@@ -100,6 +110,7 @@
<copy todir="${jboss_home}/server/${config}/conf/props/" file="${resources.dir}/hornetq-roles.properties" overwrite="true"/>
<copy todir="${jboss_home}/server/${config}/conf/props/" file="${resources.dir}/hornetq-users.properties" overwrite="true"/>
<copy todir="${jboss_home}/server/${config}/conf/" file="${resources.dir}/login-config.xml" overwrite="true"/>
+ <copy todir="${jboss_home}/server/${config}/conf" file="${resources.dir}/jbossts-properties.xml" overwrite="true"/>
<mkdir dir="${jboss_home}/server/${config}/deploy/hornetq"/>
<copy todir="${jboss_home}/server/${config}/deploy/hornetq" file="${resources.dir}/jboss-as-6/${config_type}/hornetq-configuration.xml" overwrite="true"/>
<copy todir="${jboss_home}/server/${config}/deploy/hornetq" file="${resources.dir}/jboss-as-6/${config_type}/hornetq-jboss-beans.xml" overwrite="true"/>
@@ -110,6 +121,6 @@
<mkdir dir="${jboss_home}/server/${config}/deploy/jms-ra.rar/META-INF"/>
<copy todir="${jboss_home}/server/${config}/deploy/jms-ra.rar/" file="${lib.dir}/hornetq-ra.jar" overwrite="true"/>
<copy todir="${jboss_home}/server/${config}/deploy/jms-ra.rar/META-INF" file="${resources.dir}/ra.xml" overwrite="true"/>
- <copy todir="${jboss_home}/server/${config}/deploy/deployers/jbossws.deployer" file="${lib.dir}/jbossws-hornetq.jar" overwrite="true"/>
+ <copy todir="${jboss_home}/server/${config}/deployers/jbossws.deployer" file="${lib.dir}/jbossws-hornetq.jar" overwrite="true"/>
</target>
</project>
\ No newline at end of file
Copied: branches/Branch_No_Multicast/hornetq-int/src/resources/jbossts-properties.xml (from rev 106748, branches/JBPAPP_5_1/hornetq-int/src/resources/jbossts-properties.xml)
===================================================================
--- branches/Branch_No_Multicast/hornetq-int/src/resources/jbossts-properties.xml (rev 0)
+++ branches/Branch_No_Multicast/hornetq-int/src/resources/jbossts-properties.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<transaction-service>
+ <properties name="documentation">
+ <!--
+ This is the JBossTS configuration file. Note that starting with JBossTS 4.6
+ the names jbossjta-properties.xml and jbossjts-properties.xml are obsolete.
+
+ Both the JTA and JTS versions of JBossTS now read their configuration from
+ jbossts-properties.xml, although the contents of the file differs between
+ the JTA and JTS. Care should be taken to use the correct version of the file.
+
+ ***************************
+
+ Property values may be literals or be tokens of the form ${p1[,p2][:v]}
+ in which case the token values are substituted for the values of the corresponding system
+ properties as follows:
+
+ - Any occurance of ${p} with the System.getProperty(p) value.
+ If there is no such property p defined, then the ${p} reference will remain unchanged.
+
+ - If the property reference is of the form ${p:v} and there is no such property p,
+ then the default value v will be returned.
+
+ - If the property reference is of the form ${p1,p2} or ${p1,p2:v} then
+ the primary and the secondary properties will be tried in turn, before
+ returning either the unchanged input, or the default value.
+
+ The property ${/} is replaced with System.getProperty("file.separator")
+ value and the property ${:} is replaced with System.getProperty("path.separator").
+
+ Note this substitution applies to property values only at the point they are read from
+ the config file. Tokens in system properties won't be substituted.
+ -->
+ </properties>
+ <properties depends="common" name="arjuna">
+ <!--
+ Transaction Reaper Timeout (default is 120000 ms).
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.coordinator.txReaperTimeout" value="120000"/>
+ <!--
+ Transaction Reaper Mode, can be: PERIODIC or DYNAMIC. Default is DYNAMIC.
+ -->
+ <property name="com.arjuna.ats.arjuna.coordinator.txReaperMode" value="DYNAMIC"/>
+ <!--
+ Transaction Reaper Cancel Wait Period (default is 500 ms, min is 10 msecs).
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.coordinator.txReaperCancelWaitPeriod" value="500"/>
+ <!--
+ Transaction Reaper Cancel Fail Wait Period (default is 500 ms, min is 10 msecs).
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.coordinator.txReaperCancelFailWaitPeriod" value="500"/>
+ <!--
+ Transaction Reaper Zombie Max (default is 8).
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.coordinator.txReaperZombieMax" value="8"/>
+ <!--
+ (default is NO)
+ -->
+ <property name="com.arjuna.ats.arjuna.coordinator.asyncCommit" value="NO"/>
+ <!--
+ (default is NO)
+ -->
+ <property name="com.arjuna.ats.arjuna.coordinator.asyncPrepare" value="NO"/>
+ <!--
+ (default is YES)
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.coordinator.commitOnePhase" value="YES"/>
+ <!--
+ (default is defaultStore)
+ -->
+ <property name="com.arjuna.ats.arjuna.objectstore.localOSRoot" value="defaultStore"/>
+ <!--
+ default is under user.home - must be writeable!)
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.objectstore.objectStoreDir" value="PutObjectStoreDirHere"/>
+ <!--
+ (default is ON)
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.objectstore.objectStoreSync" value="ON"/>
+ <!--
+ (default is ShadowNoFileLockStore)
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.objectstore.objectStoreType" value="ShadowNoFileLockStore"/>
+ <!--
+ (default is 255)
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.objectstore.hashedDirectories" value="255"/>
+ <!--
+ (default is ON)
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.objectstore.transactionSync" value="ON"/>
+ <!--
+ (Must be unique across all Arjuna instances.)
+ -->
+ <property name="com.arjuna.ats.arjuna.xa.nodeIdentifier" value="1"/>
+ <!--
+ Base port number for determining a unique number to associate with an instance of the transaction service
+ (which is needed in order to support multiple instances on the same machine).
+ Use the value 0 to allow the system to select the first available port number.
+ If the port number is non-zero and the port is in use then the value will be incremented until either a successful binding
+ to the loopback address is created or until the the maximum number of ports (specified by the
+ com.arjuna.ats.internal.arjuna.utils.SocketProcessIdMaxPorts property) have been tried or until the port number
+ reaches the maximum possible port number.
+ -->
+ <property
+ name="com.arjuna.ats.internal.arjuna.utils.SocketProcessIdPort" value="0"/>
+ <!--
+ The maximum number of ports to try starting from the value specified by the property
+ com.arjuna.ats.internal.arjuna.utils.SocketProcessIdPort. Any non-numeric or value less than 1 will
+ defautl to 1.
+ -->
+ <property
+ name="com.arjuna.ats.internal.arjuna.utils.SocketProcessIdMaxPorts" value="1"/>
+ <!--
+ Run the TransactionStatusManager to allow out-of-process recovery managers to query
+ the status of transactions owned by this coordinator. Default is YES.
+ This can be set to NO in cases where an ObjectStore is used only by one transaction manager
+ and the recovery manager for that store is in the same JVM. In any other cases disabling the
+ TransactionStatusManager may cause crash recovery to misbehave.
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.coordinator.transactionStatusManagerEnable" value="YES"/>
+ <!-- property
+ name="com.arjuna.ats.arjuna.coordinator.actionStore"
+ value="HashedActionStore"
+ value="JDBCActionStore"
+ -->
+ <!-- property
+ name="com.arjuna.ats.arjuna.objectstore.jdbcTxDbAccess"
+ value="JDBCAccess"
+ -->
+ <!-- property
+ name="com.arjuna.ats.arjuna.objectstore.objectStoreType"
+ value="ShadowNoFileLockStore"
+ value="JDBCStore"
+ -->
+ <!-- property
+ name="com.arjuna.ats.arjuna.objectstore.jdbcUserDbAccess"
+ value="JDBCAccess"
+ -->
+ <!-- property
+ name="com.arjuna.ats.arjuna.objectstore.jdbcPoolSizeInitial"
+ value="1"
+ -->
+ <!-- property
+ name="com.arjuna.ats.arjuna.objectstore.jdbcPoolSizeMaximum"
+ value="1"
+ -->
+ <!-- property
+ name="com.arjuna.ats.arjuna.objectstore.jdbcPoolPutConnections"
+ value="false"
+ -->
+ <!-- property
+ name="com.arjuna.ats.arjuna.internal.arjuna.objectstore.cacheStore.size"
+ value=""
+ -->
+ <!-- property
+ name="com.arjuna.ats.arjuna.internal.arjuna.objectstore.cacheStore.period"
+ value=""
+ -->
+ <!--
+ The location for creating temporary files, e.g., Uids.
+ Default is under user.home.
+ IMPORTANT: make sure the directory is lockable, e.g., /tmp on Unix
+ may not be!
+ -->
+ <!--
+ <property
+ name="com.arjuna.ats.arjuna.common.varDir"
+ value="var"/>
+ -->
+ <!-- Should beforeCompletion synchronizations be fired even when it is known the
+ transaction can't commit e.g. is marked rollbackOnly? (default NO).
+ Note that turning this on still does not guarantee the syncronizations will run in all cases
+ e.g. explicit rollback() calls. JTS users should also take into account the supportRollbackSync
+ property which affects both beforeCompletion and afterCompletion syncs. -->
+ <!--
+ <property name="com.arjuna.ats.coordinator.beforeCompletionWhenRollbackOnly" value="NO"/>
+ -->
+ </properties>
+ <properties name="common">
+ <!-- CLF 2.0 properties -->
+ <property name="com.arjuna.common.util.logging.DebugLevel"
+ type="System" value="0x00000000"/>
+ <property name="com.arjuna.common.util.logging.FacilityLevel"
+ type="System" value="0xffffffff"/>
+ <property name="com.arjuna.common.util.logging.VisibilityLevel"
+ type="System" value="0xffffffff"/>
+ <property name="com.arjuna.common.util.logger" type="System" value="log4j"/>
+ </properties>
+ <properties depends="arjuna" name="txoj">
+ <!--
+ (default is LockStore of installation - must be writeable!)
+ -->
+ <!--
+ <property
+ name="com.arjuna.ats.txoj.lockstore.lockStoreDir"
+ value="LockStore"/>
+ -->
+ <!--
+ (default is BasicLockStore)
+ -->
+ <property name="com.arjuna.ats.txoj.lockstore.lockStoreType" value="BasicLockStore"/>
+ <!--
+ (default is NO)
+ -->
+ <property name="com.arjuna.ats.txoj.lockstore.multipleLockStore" value="NO"/>
+ <!--
+ (default is YES)
+ -->
+ <property name="com.arjuna.ats.txoj.lockstore.singleLockStore" value="YES"/>
+ <!--
+ (default is YES)
+ -->
+ <property
+ name="com.arjuna.ats.txoj.lockstore.allowNestedLocking" value="YES"/>
+ </properties>
+ <properties depends="arjuna" name="jta">
+ <!--
+ Support subtransactions in the JTA layer?
+ Default is NO.
+ -->
+ <property name="com.arjuna.ats.jta.supportSubtransactions" value="NO"/>
+ <property name="com.arjuna.ats.jta.jtaTMImplementation" value="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple"/>
+ <!--
+ com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple
+ -->
+ <property name="com.arjuna.ats.jta.jtaUTImplementation" value="com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple"/>
+ <!--
+ com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple
+ -->
+ <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1"
+ value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"/>
+ </properties>
+ <properties depends="arjuna,txoj,jta" name="recoverymanager">
+ <!--
+ Properties used only by the RecoveryManager.
+ -->
+ <!--
+ Periodic recovery settings.
+ Time values in this section are in seconds.
+ -->
+ <!--
+ Interval in seconds between initiating the periodic recovery modules.
+ Default is 120 seconds.
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.recovery.periodicRecoveryPeriod" value="120"/>
+ <!--
+ Interval in seconds between first and second pass of periodic recovery.
+ Default is 10 seconds.
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.recovery.recoveryBackoffPeriod" value="10"/>
+ <!--
+ The port number on which the recovery manager listens.
+ -->
+ <property name="com.arjuna.ats.arjuna.recovery.recoveryPort" value="4712"/>
+ <!--
+ The address on which the recovery manager listens.
+ If running within an AS then the address the AS is bound to (jboss.bind.address) takes precedence
+ -->
+ <property name="com.arjuna.ats.arjuna.recovery.recoveryAddress" value=""/>
+ <!--
+ Periodic recovery modules to use. Invoked in sort-order of names.
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.recovery.recoveryExtension1" value="com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule"/>
+ <property
+ name="com.arjuna.ats.arjuna.recovery.recoveryExtension2" value="com.arjuna.ats.internal.txoj.recovery.TORecoveryModule"/>
+ <property
+ name="com.arjuna.ats.arjuna.recovery.recoveryExtension3" value="com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule"/>
+ <!--
+ Expired entry removal
+ -->
+ <!--
+ Expiry scanners to use (order of invocation is random).
+ Names must begin with "com.arjuna.ats.arjuna.recovery.expiryScanner"
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.recovery.expiryScannerTransactionStatusManager" value="com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner"/>
+ <!--
+ Interval, in hours, between running the expiry scanners.
+ This can be quite long. The absolute value determines the interval -
+ if the value is negative, the scan will NOT be run until after one
+ interval has elapsed. If positive the first scan will be immediately
+ after startup. Zero will prevent any scanning.
+ Default = 12 = run immediately, then every 12 hours.
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.recovery.expiryScanInterval" value="12"/>
+ <!--
+ This is the interval, in hours, after which a process that cannot be contacted will be considered dead.
+ It should be long enough to avoid accidentally removing valid entries due to short lived
+ transient errors such as network downtime. Zero = Never removed. Default is 12.
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.recovery.transactionStatusManagerExpiryTime" value="12"/>
+ <!--
+ Use this to fix the port on which the TransactionStatusManager listens,
+ The default behaviour is to use any free port.
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.recovery.transactionStatusManagerPort" value="0"/>
+ <!--
+ Use this to fix the address on which the TransactionStatusManager binds,
+ The default behaviour is to use the loopback address (ie localhost).
+ If running within an AS then the address the AS is bound to (jboss.bind.address) takes precedence
+ -->
+ <property
+ name="com.arjuna.ats.arjuna.recovery.transactionStatusManagerAddress" value=""/>
+ <!--
+ For cases where the recovery manager is in process with the transaction manager and nothing else uses
+ the ObjectStore, it is possible to disable the socket based recovery listener by setting this to NO.
+ Caution: use of this property can allow multiple recovery processes to run on the same ObjectStore
+ if you are not careful. That in turn can lead to incorrect transaction processing. Use with care.
+ -->
+ <property name="com.arjuna.ats.arjuna.recovery.recoveryListener" value="YES"/>
+ </properties>
+ <properties depends="jta" name="jdbc">
+ <!--
+ property name="com.arjuna.ats.jdbc.isolationLevel" value="TRANSACTION_SERIALIZABLE"/>
+ -->
+ </properties>
+</transaction-service>
Modified: branches/Branch_No_Multicast/main/build.xml
===================================================================
--- branches/Branch_No_Multicast/main/build.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/main/build.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -174,6 +174,7 @@
<!-- Include getopt -->
<zipfileset src="${gnu.getopt.lib}/getopt.jar">
<include name="**"/>
+ <exclude name="META-INF/JBOSSCOD.*"/>
</zipfileset>
</jar>
Modified: branches/Branch_No_Multicast/main/src/bin/server.policy.cert
===================================================================
--- branches/Branch_No_Multicast/main/src/bin/server.policy.cert 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/main/src/bin/server.policy.cert 2010-07-15 14:29:25 UTC (rev 106749)
@@ -1,9 +1,16 @@
// The Java2 security policy for EAP5 with signed jars
// Install with -Djava.security.policy==server.policy.cert
-// and -Djboss.home.dir=path_to_jboss_distribution
+// -Djboss.home.dir=path_to_jboss_distribution
+// -Djboss.server.home.dir= path to the server distro (default, production etc)
+
+//********************************************************
+// Keystore should be where you have imported the Red Hat
+// Code Signing Public Key
+//********************************************************
keystore "file:${java.home}/lib/security/cacerts";
+
// ***************************************
// Trusted core Java code
//***************************************
@@ -23,18 +30,26 @@
// Trusted core JBoss code
//***************************************
grant codeBase "file:${jboss.home.dir}/bin/run.jar" {
- permission java.security.AllPermission;
+ permission java.security.AllPermission;
};
grant signedBy "jboss" {
permission java.security.AllPermission;
};
+//**************************************************************************************************
+// Permissions to selected set of jars that are not signed
+//**************************************************************************************************
+
grant codeBase "file:${jboss.server.home.dir}/deploy/quartz-ra.rar/-" {
permission java.security.AllPermission;
};
-grant codeBase "file:${jboss.home.dir}/server/default/deploy/uuid-key-generator.sar/-" {
+grant codeBase "jar:file:${jboss.server.home.dir}/deploy/quartz-ra.rar!/quartz-ra.jar" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/deploy/uuid-key-generator.sar/-" {
permission javax.management.MBeanTrustPermission "register";
permission javax.management.MBeanPermission "*", "getAttribute";
permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","lookup,rebind,unbind";
@@ -48,6 +63,7 @@
};
+
//****************************************************************
// Default block of permissions
// Minimal permissions are allowed to everyone else
Copied: branches/Branch_No_Multicast/main/src/main/org/jboss/system/security (from rev 106748, branches/JBPAPP_5_1/main/src/main/org/jboss/system/security)
Deleted: branches/Branch_No_Multicast/main/src/main/org/jboss/system/security/DebuggingJavaSecurityManager.java
===================================================================
--- branches/JBPAPP_5_1/main/src/main/org/jboss/system/security/DebuggingJavaSecurityManager.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/main/src/main/org/jboss/system/security/DebuggingJavaSecurityManager.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -1,191 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.system.security;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.security.AccessControlException;
-import java.security.AccessController;
-import java.security.Permission;
-import java.security.PrivilegedAction;
-
-/**
- * A Security Manager that is useful for debugging access exceptions
- * because the default security manager in the JDK can be very verbose
- * and difficult to debug
- *
- * <b> NOTE:</b> Do not use this security manager in production.
- *
- * <b> USAGE:</b> -Djava.security.manager -Djava.security.manager=org.jboss.system.security.DebuggingJavaSecurityManager
- *
- * @author Anil.Saldhana at redhat.com
- * @since Mar 26, 2010
- */
- at SuppressWarnings("unchecked")
-public class DebuggingJavaSecurityManager extends SecurityManager
-{
- FilteringPrintStream fps = null;
-
- /**
- * JBoss Logging Subsystem tries to install its own stdout/stderr which can
- * mess around with this debugging security manager which installs a filtering
- * print stream (as the JDK Java Security Manager runs in a full debug mode)
- */
- private boolean settingStream = false;
-
- /**
- * We are filtering the log entries. We do not want to see the verbose
- * "access allowed" console entries from the Java Security Manager
- */
- private static boolean turnOnLogging = false;
-
- public DebuggingJavaSecurityManager()
- {
- AccessController.doPrivileged( new PrivilegedAction()
- {
- @Override
- public Object run() {
- try
- {
- fps = new FilteringPrintStream();
- setStreams();
- }
- catch(Exception e)
- {
- e.printStackTrace();
- }return null;
- }});
- }
-
- public void checkRead(final String file)
- {
- //We blank this method to avoid a stack over flow error
- }
-
- @Override
- public void checkPermission(final Permission perm)
- {
- turnOnLogging = false;
-
- try
- {
- if(System.err != fps )
- setStreams();
- super.checkPermission(perm);
-
- }
- catch( AccessControlException ace )
- {
- turnOnLogging = true;
- throw ace;
- }
- }
-
-
- private static class FilteringPrintStream extends PrintStream
- {
- private PrintStream ps;
-
- public FilteringPrintStream( ) throws FileNotFoundException
- {
- super( new DummyOutputStream() );
- this.ps = System.err;
- }
-
- @Override
- public void println(String x)
- {
- if( DebuggingJavaSecurityManager.turnOnLogging == false )
- {
- if( x.contains( "allowed") )
- return;
- if( x.contains( "domain that failed ProtectionDomain") || x.contains( "Confirming")
- || x.contains("denied") || x.contains( "Exception" ) )
- {
- ps.println(x);
- }
- }
- }
-
- public void print(String s)
- {
- ps.print(s);
- }
- }
-
- private static class DummyOutputStream extends OutputStream
- {
-
- @Override
- public void write(int b) throws IOException
- {
-
- }
- }
-
- /**
- * Since the JBoss Logging Subsystem can install its own std err/output stream, it is very
- * important for debugging purposes to set the security manager output to our custom
- * PrintStream.
- */
- private void setStreams()
- {
- AccessController.doPrivileged( new PrivilegedAction()
- {
- @Override
- public Object run() {
- try
- {
- //recursive check may be happening
- if (settingStream == true )
- return null;
- settingStream = true;
-
- System.err.println( " ");
- System.err.println( " ");
-
- System.err.println( "*** Java Security Manager is the one for debugging. DO NOT USE THIS IN PRODUCTION ****");
- System.err.println( " ");
- System.err.println( " ");
- System.err.println( " ");
- System.err.println( " ");
-
- System.err.println( "WE ARE SETTING THE error and output streams to FILTERINGPRINTSTREAM (Not for ***Production*** Use)");
- if( fps == null)
- fps = new FilteringPrintStream();
- System.setErr( fps);
-
- System.setOut(fps);
-
- System.err.println( "Confirming that the error stream is set to FILTERINGPRINTSTREAM : " + (fps == System.err));
-
- settingStream = false;
- }
- catch(Exception e)
- {
- e.printStackTrace();
- }return null;
- }});
- }
-}
\ No newline at end of file
Copied: branches/Branch_No_Multicast/main/src/main/org/jboss/system/security/DebuggingJavaSecurityManager.java (from rev 106748, branches/JBPAPP_5_1/main/src/main/org/jboss/system/security/DebuggingJavaSecurityManager.java)
===================================================================
--- branches/Branch_No_Multicast/main/src/main/org/jboss/system/security/DebuggingJavaSecurityManager.java (rev 0)
+++ branches/Branch_No_Multicast/main/src/main/org/jboss/system/security/DebuggingJavaSecurityManager.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -0,0 +1,191 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.system.security;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.security.AccessControlException;
+import java.security.AccessController;
+import java.security.Permission;
+import java.security.PrivilegedAction;
+
+/**
+ * A Security Manager that is useful for debugging access exceptions
+ * because the default security manager in the JDK can be very verbose
+ * and difficult to debug
+ *
+ * <b> NOTE:</b> Do not use this security manager in production.
+ *
+ * <b> USAGE:</b> -Djava.security.manager -Djava.security.manager=org.jboss.system.security.DebuggingJavaSecurityManager
+ *
+ * @author Anil.Saldhana at redhat.com
+ * @since Mar 26, 2010
+ */
+ at SuppressWarnings("unchecked")
+public class DebuggingJavaSecurityManager extends SecurityManager
+{
+ FilteringPrintStream fps = null;
+
+ /**
+ * JBoss Logging Subsystem tries to install its own stdout/stderr which can
+ * mess around with this debugging security manager which installs a filtering
+ * print stream (as the JDK Java Security Manager runs in a full debug mode)
+ */
+ private boolean settingStream = false;
+
+ /**
+ * We are filtering the log entries. We do not want to see the verbose
+ * "access allowed" console entries from the Java Security Manager
+ */
+ private static boolean turnOnLogging = false;
+
+ public DebuggingJavaSecurityManager()
+ {
+ AccessController.doPrivileged( new PrivilegedAction()
+ {
+ @Override
+ public Object run() {
+ try
+ {
+ fps = new FilteringPrintStream();
+ setStreams();
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ }return null;
+ }});
+ }
+
+ public void checkRead(final String file)
+ {
+ //We blank this method to avoid a stack over flow error
+ }
+
+ @Override
+ public void checkPermission(final Permission perm)
+ {
+ turnOnLogging = false;
+
+ try
+ {
+ if(System.err != fps )
+ setStreams();
+ super.checkPermission(perm);
+
+ }
+ catch( AccessControlException ace )
+ {
+ turnOnLogging = true;
+ throw ace;
+ }
+ }
+
+
+ private static class FilteringPrintStream extends PrintStream
+ {
+ private PrintStream ps;
+
+ public FilteringPrintStream( ) throws FileNotFoundException
+ {
+ super( new DummyOutputStream() );
+ this.ps = System.err;
+ }
+
+ @Override
+ public void println(String x)
+ {
+ if( DebuggingJavaSecurityManager.turnOnLogging == false )
+ {
+ if( x.contains( "allowed") )
+ return;
+ if( x.contains( "domain that failed ProtectionDomain") || x.contains( "Confirming")
+ || x.contains("denied") || x.contains( "Exception" ) )
+ {
+ ps.println(x);
+ }
+ }
+ }
+
+ public void print(String s)
+ {
+ ps.print(s);
+ }
+ }
+
+ private static class DummyOutputStream extends OutputStream
+ {
+
+ @Override
+ public void write(int b) throws IOException
+ {
+
+ }
+ }
+
+ /**
+ * Since the JBoss Logging Subsystem can install its own std err/output stream, it is very
+ * important for debugging purposes to set the security manager output to our custom
+ * PrintStream.
+ */
+ private void setStreams()
+ {
+ AccessController.doPrivileged( new PrivilegedAction()
+ {
+ @Override
+ public Object run() {
+ try
+ {
+ //recursive check may be happening
+ if (settingStream == true )
+ return null;
+ settingStream = true;
+
+ System.err.println( " ");
+ System.err.println( " ");
+
+ System.err.println( "*** Java Security Manager is the one for debugging. DO NOT USE THIS IN PRODUCTION ****");
+ System.err.println( " ");
+ System.err.println( " ");
+ System.err.println( " ");
+ System.err.println( " ");
+
+ System.err.println( "WE ARE SETTING THE error and output streams to FILTERINGPRINTSTREAM (Not for ***Production*** Use)");
+ if( fps == null)
+ fps = new FilteringPrintStream();
+ System.setErr( fps);
+
+ System.setOut(fps);
+
+ System.err.println( "Confirming that the error stream is set to FILTERINGPRINTSTREAM : " + (fps == System.err));
+
+ settingStream = false;
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ }return null;
+ }});
+ }
+}
\ No newline at end of file
Modified: branches/Branch_No_Multicast/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
===================================================================
--- branches/Branch_No_Multicast/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -91,14 +91,14 @@
import org.jboss.metatype.api.values.MetaValueFactory;
import org.jboss.metatype.api.values.SimpleValue;
import org.jboss.profileservice.spi.ManagedMBeanDeploymentFactory;
+import org.jboss.profileservice.spi.ManagedMBeanDeploymentFactory.MBeanComponent;
+import org.jboss.profileservice.spi.ManagedMBeanDeploymentFactory.MBeanDeployment;
import org.jboss.profileservice.spi.NoSuchDeploymentException;
import org.jboss.profileservice.spi.NoSuchProfileException;
import org.jboss.profileservice.spi.Profile;
import org.jboss.profileservice.spi.ProfileDeployment;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
-import org.jboss.profileservice.spi.ManagedMBeanDeploymentFactory.MBeanComponent;
-import org.jboss.profileservice.spi.ManagedMBeanDeploymentFactory.MBeanDeployment;
import org.jboss.system.server.profileservice.attachments.AttachmentStore;
/**
@@ -238,7 +238,7 @@
// If the profile is not modified do nothing
if(isReload() == false)
{
- log.debug("Not reloading profiles.");
+ log.trace("Not reloading profiles.");
return false;
}
this.forceReload = false;
@@ -260,18 +260,18 @@
// Process mbean components that need to be exposed as ManagedDeployment/ManagedComponent
for(ManagedMBeanDeploymentFactory mdf : mdfs.values())
{
- log.debug("Processing deployments for factory: "+mdf.getFactoryName());
+ log.trace("Processing deployments for factory: "+mdf.getFactoryName());
Collection<MBeanDeployment> deployments = mdf.getDeployments(mbeanServer);
for(MBeanDeployment md : deployments)
{
- log.debug("Saw MBeanDeployment: "+md);
+ log.trace("Saw MBeanDeployment: "+md);
HashMap<String, ManagedObject> unitMOs = new HashMap<String, ManagedObject>();
Collection<MBeanComponent> components = md.getComponents();
if(components != null)
{
for(MBeanComponent comp : components)
{
- log.debug("Saw MBeanComponent: "+comp);
+ log.trace("Saw MBeanComponent: "+comp);
try
{
ManagedObject mo = createManagedObject(comp.getName(), mdf.getDefaultViewUse(), mdf.getPropertyMetaMappings());
@@ -487,7 +487,7 @@
protected void loadProfiles(boolean trace)
{
- log.debug("reloading profiles: "+ this.ps.getActiveProfileKeys());
+ log.trace("reloading profiles: "+ this.ps.getActiveProfileKeys());
for(ProfileKey key : this.ps.getActiveProfileKeys())
{
try
@@ -519,6 +519,9 @@
ManagedDeployment md = new ManagedDeploymentImpl(deploymentName,
deployment.getRoot().getName());
+ //
+ md.setAttachment(Exception.class.getName(), e);
+
// Try to get the cached deployment type
Collection<String> deploymentTypes = (Collection<String>) deployment
.getTransientAttachment(KnownDeploymentTypes.class.getName());
@@ -671,7 +674,7 @@
throws Exception
{
String key = mo.getName() + "/" + mo.getNameType();
- log.debug("ID for ManagedObject: "+key+", attachmentName: "+mo.getAttachmentName());
+ log.trace("ID for ManagedObject: "+key+", attachmentName: "+mo.getAttachmentName());
// See if this is a runtime ManagedObject
Map<String, Annotation> moAnns = mo.getAnnotations();
@@ -687,7 +690,7 @@
comp = this.proxyFactory.createComponentProxy(comp);
md.addComponent(mo.getName(), comp);
- log.debug("Processing ManagementComponent("+mo.getName()+"): "+comp);
+ log.trace("Processing ManagementComponent("+mo.getName()+"): "+comp);
Set<ManagedComponent> typeComps = compByCompType.get(type);
if (typeComps == null)
{
@@ -709,7 +712,7 @@
ManagedObject parentMO = moRegistry.get(key);
if (parentMO == null && isMC == false)
{
- log.debug("Deferring resolution of runtime ManagedObject: "+managementObject);
+ log.trace("Deferring resolution of runtime ManagedObject: "+managementObject);
// Save the runtime mo for merging
runtimeMOs.put(key, mo);
}
@@ -724,7 +727,7 @@
if (comp != null)
{
RunState state = updateRunState(mo, comp);
- log.debug("Updated component: "+comp+" run state to: "+state);
+ log.trace("Updated component: "+comp+" run state to: "+state);
}
// There is no further processing of runtime ManagedObjects, unless its marked as a component
if (isMC == false)
@@ -751,7 +754,7 @@
if (comp != null)
{
RunState state = updateRunState(runtimeMO, comp);
- log.debug("Updated component: "+comp+" run state to: "+state);
+ log.trace("Updated component: "+comp+" run state to: "+state);
}
}
}
@@ -762,7 +765,7 @@
// if( prevMO != null )
// {
// // This should only matter for ManagedObjects that have a ManagementObjectID
-// log.debug("Duplicate mo for key: "+key+", prevMO: "+prevMO);
+// log.trace("Duplicate mo for key: "+key+", prevMO: "+prevMO);
// return;
// }
// Check for unresolved refs
@@ -771,7 +774,7 @@
// Scan for @ManagementObjectRef
for(ManagedProperty prop : mo.getProperties().values())
{
- log.debug("Checking property: "+prop);
+ log.trace("Checking property: "+prop);
// See if this is a ManagementObjectID
Map<String, Annotation> pannotations = prop.getAnnotations();
if (pannotations != null && pannotations.isEmpty() == false)
@@ -783,7 +786,7 @@
if (refName == null)
refName = id.name();
String propKey = refName + "/" + id.type();
- log.debug("ManagedProperty level ID for ManagedObject: "+propKey+", attachmentName: "+mo.getAttachmentName());
+ log.trace("ManagedProperty level ID for ManagedObject: "+propKey+", attachmentName: "+mo.getAttachmentName());
moRegistry.put(propKey, mo);
checkForReferences(propKey, mo);
}
@@ -792,7 +795,7 @@
if ( ref != null )
{
// The reference key is the prop value + ref.type()
- log.debug("Property("+prop.getName()+") references: "+ref);
+ log.trace("Property("+prop.getName()+") references: "+ref);
Object refName = getRefName(prop.getValue());
if (refName == null)
refName = ref.name();
@@ -800,7 +803,7 @@
ManagedObject target = moRegistry.get(targetKey);
if (target != null)
{
- log.debug("Resolved property("+prop.getName()+") reference to: "+targetKey);
+ log.trace("Resolved property("+prop.getName()+") reference to: "+targetKey);
prop.setTargetManagedObject(target);
}
else
@@ -1177,13 +1180,13 @@
public void addManagedMBeanDeployments(ManagedMBeanDeploymentFactory factory)
{
- log.debug("addManagedDeployment, "+factory);
+ log.trace("addManagedDeployment, "+factory);
String name = factory.getFactoryName();
this.mdfs.put(name, factory);
}
public void removeManagedMBeanDeployments(ManagedMBeanDeploymentFactory factory)
{
- log.debug("removeManagedDeployment, "+factory);
+ log.trace("removeManagedDeployment, "+factory);
String name = factory.getFactoryName();
this.mdfs.remove(name);
}
@@ -1191,13 +1194,13 @@
public void addTemplate(DeploymentTemplate template)
{
this.templates.put(template.getInfo().getName(), template);
- log.debug("addTemplate: "+template);
+ log.trace("addTemplate: "+template);
}
public void removeTemplate(DeploymentTemplate template)
{
this.templates.remove(template.getInfo().getName());
- log.debug("removeTemplate: "+template);
+ log.trace("removeTemplate: "+template);
}
@@ -1474,7 +1477,7 @@
// Apply the managed properties to the server ManagedDeployment/ManagedComponent
ManagedDeployment compMD = managedDeployments.get(md.getName());
- log.debug("updateComponent, deploymentName="+name+": "+compMD);
+ log.trace("updateComponent, deploymentName="+name+": "+compMD);
ManagedComponent serverComp = null;
// Find the managed component again
@@ -1596,7 +1599,7 @@
// Apply the managed properties to the server ManagedDeployment/ManagedComponent
ManagedDeployment compMD = managedDeployments.get(md.getName());
- log.debug("updateComponent, deploymentName="+name+": "+compMD);
+ log.trace("updateComponent, deploymentName="+name+": "+compMD);
ManagedComponent serverComp = null;
// Find the managed component again
@@ -1630,7 +1633,7 @@
}
//
- log.debug("remove component: " + comp + ", deployment: "+ profileDeployment);
+ log.trace("remove component: " + comp + ", deployment: "+ profileDeployment);
// Remove
this.store.removeComponent(comp.getDeployment().getName(), serverComp);
}
@@ -1656,7 +1659,7 @@
protected void checkForReferences(String key, ManagedObject mo)
{
Set<ManagedProperty> referers = unresolvedRefs.get(key);
- log.debug("checkForReferences, "+key+" has referers: "+referers);
+ log.trace("checkForReferences, "+key+" has referers: "+referers);
if (referers != null)
{
for(ManagedProperty prop : referers)
Modified: branches/Branch_No_Multicast/profileservice/src/main/org/jboss/profileservice/web/DebugServlet.java
===================================================================
--- branches/Branch_No_Multicast/profileservice/src/main/org/jboss/profileservice/web/DebugServlet.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/profileservice/src/main/org/jboss/profileservice/web/DebugServlet.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -23,7 +23,8 @@
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.Arrays;
+import java.io.StringWriter;
+import java.io.Writer;
import java.util.Map;
import java.util.Set;
@@ -37,6 +38,7 @@
import javax.servlet.http.HttpServletResponse;
import org.jboss.deployers.spi.management.ManagementView;
+import org.jboss.managed.api.DeploymentState;
import org.jboss.managed.api.ManagedComponent;
import org.jboss.managed.api.ManagedDeployment;
@@ -46,9 +48,12 @@
*/
public class DebugServlet extends HttpServlet
{
+ private static final String MgtViewName = "ManagementView";
private static final long serialVersionUID = 1;
- @Resource(mappedName="java:ManagementView")
+
+ @Resource(mappedName = MgtViewName)
private ManagementView mgtView;
+
enum Operations {
listDeploymentTree,
listOperations
@@ -64,7 +69,7 @@
try
{
InitialContext ctx = new InitialContext();
- mgtView = (ManagementView) ctx.lookup("java:ManagementView");
+ mgtView = (ManagementView) ctx.lookup(MgtViewName);
}
catch (NamingException e)
{
@@ -78,7 +83,9 @@
throws ServletException, IOException
{
if(mgtView == null)
+ {
throw new ServletException("The ManagementView has not been injected");
+ }
String op = req.getParameter("op");
if(op == null)
op = "listOperations";
@@ -89,7 +96,7 @@
{
case listDeploymentTree:
opResult = listDeploymentTree();
- break;
+ break;
case listOperations:
opResult = listOperations();
break;
@@ -116,10 +123,22 @@
Set<String> names = mgtView.getDeploymentNames();
for(String name : names)
{
- ManagedDeployment md = mgtView.getDeployment(name);
+ final ManagedDeployment md = mgtView.getDeployment(name);
+ final DeploymentState state = md.getDeploymentState();
tmp.append("ManagedDeployment: ");
tmp.append(md.getName());
+ tmp.append("; state: ").append(state);
tmp.append('\n');
+ if(state == DeploymentState.STOPPED || state == DeploymentState.FAILED)
+ {
+ // In case there are debug information
+ final Exception e = md.getAttachment(Exception.class);
+ if(e != null)
+ {
+ tmp.append("Cause: ").append(getStackTrace(e));
+ tmp.append('\n');
+ }
+ }
Map<String, ManagedComponent> mcs = md.getComponents();
if(mcs != null)
{
@@ -138,6 +157,7 @@
tmp.append('\n');
}
}
+ tmp.append('\n');
}
}
catch(Exception e)
@@ -146,6 +166,7 @@
}
return tmp.toString();
}
+
protected String listOperations()
{
StringBuilder tmp = new StringBuilder();
@@ -159,4 +180,12 @@
}
return tmp.toString();
}
+
+ static String getStackTrace(Throwable aThrowable) {
+ final Writer result = new StringWriter();
+ final PrintWriter printWriter = new PrintWriter(result);
+ aThrowable.printStackTrace(printWriter);
+ return result.toString();
+ }
+
}
Copied: branches/Branch_No_Multicast/security/docs (from rev 106748, branches/JBPAPP_5_1/security/docs)
Copied: branches/Branch_No_Multicast/security/docs/diagrams (from rev 106748, branches/JBPAPP_5_1/security/docs/diagrams)
Deleted: branches/Branch_No_Multicast/security/docs/diagrams/EAP5_SecurityModel_Interface.dia
===================================================================
(Binary files differ)
Copied: branches/Branch_No_Multicast/security/docs/diagrams/EAP5_SecurityModel_Interface.dia (from rev 106748, branches/JBPAPP_5_1/security/docs/diagrams/EAP5_SecurityModel_Interface.dia)
===================================================================
(Binary files differ)
Deleted: branches/Branch_No_Multicast/security/docs/diagrams/EAP5_SecurityModel_Interface.png
===================================================================
(Binary files differ)
Copied: branches/Branch_No_Multicast/security/docs/diagrams/EAP5_SecurityModel_Interface.png (from rev 106748, branches/JBPAPP_5_1/security/docs/diagrams/EAP5_SecurityModel_Interface.png)
===================================================================
(Binary files differ)
Copied: branches/Branch_No_Multicast/security/src/etc/bin/password_tool.bat (from rev 106748, branches/JBPAPP_5_1/security/src/etc/bin/password_tool.bat)
===================================================================
--- branches/Branch_No_Multicast/security/src/etc/bin/password_tool.bat (rev 0)
+++ branches/Branch_No_Multicast/security/src/etc/bin/password_tool.bat 2010-07-15 14:29:25 UTC (rev 106749)
@@ -0,0 +1,40 @@
+ at echo off
+rem -------------------------------------------------------------------------
+rem JBoss Password Tool
+rem -------------------------------------------------------------------------
+
+if not "%ECHO%" == "" echo %ECHO%
+if "%OS%" == "Windows_NT" setlocal
+
+set DIRNAME=.\
+if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
+set PROGNAME=password_tool.bat
+if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
+
+set JAVA=%JAVA_HOME%\bin\java
+if "%JBOSS_HOME%" == "" set JBOSS_HOME=%DIRNAME%\..
+
+rem Setup the java endorsed dirs
+set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
+
+rem Setup the jboss password tool classpath
+rem Shared libs
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JAVA_HOME%\lib\tools.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\commons-logging.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\jboss-logging-spi.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\lib\endorsed\xalan.jar
+
+rem Shared jaxb libs
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\activation.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\jaxb-api.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\jaxb-impl.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\stax-api.jar
+
+rem Specific dependencies
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\xmlsec.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\jbosssx-as-client.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\common\lib\jbosssx.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\common\lib\log4j.jar
+
+rem Execute the JVM
+"%JAVA%" %JAVA_OPTS% "-Djava.endorsed.dirs=%JBOSS_ENDORSED_DIRS%" "-Dprogram.name=%PROGNAME%" -classpath "%JBOSSPASS_CLASSPATH%" org.jboss.security.integration.password.PasswordTool %*
\ No newline at end of file
Modified: branches/Branch_No_Multicast/security/src/etc/deploy/security-jboss-beans.xml
===================================================================
--- branches/Branch_No_Multicast/security/src/etc/deploy/security-jboss-beans.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/security/src/etc/deploy/security-jboss-beans.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -25,24 +25,6 @@
<property name="passwordManagement"><inject bean="JBossSecurityPasswordMaskManagement"/></property>
</lifecycle-configure>
- <lifecycle-create xmlns="urn:jboss:aop-beans:1.0"
- name="PasswordCreateDestroyAdvice"
- class="org.jboss.security.integration.password.PasswordLifecycleCallback"
- classes="@org.jboss.security.integration.password.Password"
- manager-bean="AspectManager"
- manager-property="aspectManager">
- <property name="passwordManagement"><inject bean="JBossSecurityPasswordMaskManagement"/></property>
- </lifecycle-create>
-
- <lifecycle-install xmlns="urn:jboss:aop-beans:1.0"
- name="PasswordStartStopAdvice"
- class="org.jboss.security.integration.password.PasswordLifecycleCallback"
- classes="@org.jboss.security.integration.password.Password"
- manager-bean="AspectManager"
- manager-property="aspectManager">
- <property name="passwordManagement"><inject bean="JBossSecurityPasswordMaskManagement"/></property>
- </lifecycle-install>
-
<!-- Establish the basic XML Based Configuration-->
<bean name="XMLLoginConfig" class="org.jboss.security.auth.login.XMLLoginConfig">
<property name="configResource">login-config.xml</property>
@@ -57,10 +39,6 @@
<bean name="JBossSecurityJNDIContextEstablishment"
class="org.jboss.security.integration.JNDIContextEstablishment"/>
- <!-- JNDI Based Security Management -->
- <bean name="JNDIBasedSecurityManagement"
- class="org.jboss.security.integration.JNDIBasedSecurityManagement"/>
-
<!-- Instance of JBoss Security Subject Factory -->
<bean name="JBossSecuritySubjectFactory"
class="org.jboss.security.integration.JBossSecuritySubjectFactory">
Modified: branches/Branch_No_Multicast/security/src/main/org/jboss/security/auth/AuthenticationTimedCachePolicy.java
===================================================================
--- branches/Branch_No_Multicast/security/src/main/org/jboss/security/auth/AuthenticationTimedCachePolicy.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/security/src/main/org/jboss/security/auth/AuthenticationTimedCachePolicy.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -21,6 +21,7 @@
*/
package org.jboss.security.auth;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -34,7 +35,7 @@
* @author <a href="mmoyses at redhat.com">Marcus Moyses</a>
* @version $Revision: 1 $
*/
-public class AuthenticationTimedCachePolicy extends TimedCachePolicy
+public class AuthenticationTimedCachePolicy extends TimedCachePolicy implements Serializable
{
public AuthenticationTimedCachePolicy(int defaultCacheTimeout, boolean b, int defaultCacheResolution)
{
Modified: branches/Branch_No_Multicast/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java
===================================================================
--- branches/Branch_No_Multicast/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -231,6 +231,7 @@
public void setAuthenticationMgrClass(String authenticationMgrClass)
{
this.authenticationMgrClass = authenticationMgrClass;
+ securityMgrMap.clear();
}
@ManagementProperty(use = {ViewUse.CONFIGURATION},
@@ -364,19 +365,16 @@
{
log.debug("Creating SDC for domain="+securityDomain);
AuthenticationManager am = createAuthenticationManager(securityDomain);
- if(cachePolicy == null)
- {
- cachePolicy = createDefaultCachePolicy();
- }
+ CachePolicy cache = createDefaultCachePolicy();
//Set security cache if the auth manager implementation supports it
- setSecurityDomainCache(am, cachePolicy);
+ setSecurityDomainCache(am, cache);
//Set DeepCopySubject option if supported
if(SecurityConfiguration.isDeepCopySubjectMode())
{
setDeepCopySubjectMode(am);
}
- SecurityDomainContext securityDomainContext = new SecurityDomainContext(am, cachePolicy);
+ SecurityDomainContext securityDomainContext = new SecurityDomainContext(am, cache);
securityDomainContext.setAuthorizationManager(createAuthorizationManager(securityDomain));
securityDomainContext.setAuditMgr(createAuditManager(securityDomain));
Modified: branches/Branch_No_Multicast/security/src/main/org/jboss/security/integration/SecurityConstantsBridge.java
===================================================================
--- branches/Branch_No_Multicast/security/src/main/org/jboss/security/integration/SecurityConstantsBridge.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/security/src/main/org/jboss/security/integration/SecurityConstantsBridge.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -36,4 +36,16 @@
public static int defaultCacheResolution = 60;
/** Frequency of the thread cleaning the authentication cache of expired entries */
public static int defaultCacheFlushPeriod = 60*60;
+
+ private static JNDIBasedSecurityManagement securityManagement;
+
+ public static JNDIBasedSecurityManagement getSecurityManagement()
+ {
+ return securityManagement;
+ }
+
+ public void setSecurityManagement(JNDIBasedSecurityManagement securityManagement)
+ {
+ this.securityManagement = securityManagement;
+ }
}
Modified: branches/Branch_No_Multicast/security/src/main/org/jboss/security/integration/SecurityDomainObjectFactory.java
===================================================================
--- branches/Branch_No_Multicast/security/src/main/org/jboss/security/integration/SecurityDomainObjectFactory.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/security/src/main/org/jboss/security/integration/SecurityDomainObjectFactory.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -51,7 +51,7 @@
*/
public class SecurityDomainObjectFactory implements InvocationHandler, ObjectFactory
{
- private JNDIBasedSecurityManagement securityManagement = new JNDIBasedSecurityManagement();
+ private JNDIBasedSecurityManagement securityManagement = SecurityConstantsBridge.getSecurityManagement();
public void setSecurityManagement(JNDIBasedSecurityManagement sm)
{
@@ -170,4 +170,4 @@
//return domains.nextElement();
}
}
-}
\ No newline at end of file
+}
Modified: branches/Branch_No_Multicast/security/src/main/org/jboss/security/integration/password/PasswordLifecycleCallback.java
===================================================================
--- branches/Branch_No_Multicast/security/src/main/org/jboss/security/integration/password/PasswordLifecycleCallback.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/security/src/main/org/jboss/security/integration/password/PasswordLifecycleCallback.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -21,14 +21,20 @@
*/
package org.jboss.security.integration.password;
+import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
+import org.jboss.beans.metadata.spi.AnnotationMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.kernel.plugins.dependency.AbstractKernelControllerContext;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.logging.Logger;
-import org.jboss.metadata.spi.MetaData;
/**
* AOP Lifecycle callback for the @Password annotation
@@ -94,39 +100,51 @@
public void install(ControllerContext context) throws Exception
{
//Get the password
- Password passwordAnnotation = readPasswordAnnotation(context);
- boolean trace = log.isTraceEnabled();
- if( trace )
- log.trace("Binding into JNDI: " + context.getName() + ", passwordInfo: " + passwordAnnotation);
-
- String securityDomain = passwordAnnotation.securityDomain();
-
- char[] passwd = this.passwordManagement.getPassword(securityDomain);
-
- if(passwd == null)
- log.trace("Password does not exist for security domain=" + securityDomain);
- //The bean in question is the target
- String methodName = passwordAnnotation.methodName();
- Object target = context.getTarget();
- if(trace)
+ List<Password> passwordAnnotations = readPasswordAnnotation(context);
+ for (Password passwordAnnotation : passwordAnnotations)
{
- log.trace("Trying to set password on " + target + " with method :" + methodName);
+
+ boolean trace = log.isTraceEnabled();
+ if (trace)
+ log.trace("Binding into JNDI: " + context.getName() + ", passwordInfo: " + passwordAnnotation);
+
+ String securityDomain = passwordAnnotation.securityDomain();
+
+ char[] passwd = this.passwordManagement.getPassword(securityDomain);
+
+ if (passwd == null)
+ log.trace("Password does not exist for security domain=" + securityDomain);
+ //The bean in question is the target
+ String methodName = passwordAnnotation.methodName();
+ Object target = context.getTarget();
+ if (trace)
+ {
+ log.trace("Trying to set password on " + target + " with method :" + methodName);
+ }
+ this.setPassword(target, passwordAnnotation, passwd);
}
- this.setPassword(target, passwordAnnotation, passwd);
}
public void uninstall(ControllerContext context) throws Exception
{
//ignore
}
-
- private Password readPasswordAnnotation(ControllerContext context) throws Exception
+ private List<Password> readPasswordAnnotation(ControllerContext context) throws Exception
{
- MetaData metaData = context.getScopeInfo().getMetaData();
- if (metaData != null)
- return metaData.getAnnotation(Password.class);
- return null;
+ List<Password> passwordAnnotations = new ArrayList<Password>();
+ AbstractKernelControllerContext akcc = (AbstractKernelControllerContext) context;
+ BeanMetaData bmd = akcc.getBeanMetaData();
+ Set<AnnotationMetaData> annotations = bmd.getAnnotations();
+ for (AnnotationMetaData annotationMetaData : annotations)
+ {
+ Annotation annotation = annotationMetaData.getAnnotationInstance();
+ if (annotation.annotationType() == Password.class)
+ {
+ passwordAnnotations.add((Password) annotation);
+ }
+ }
+ return passwordAnnotations;
}
private void setPassword(Object target, Password passwordAnnotation, char[] passwd) throws Exception
@@ -148,4 +166,4 @@
m.invoke(target, new Object[] { new String(passwd)} );
}
}
-}
\ No newline at end of file
+}
Modified: branches/Branch_No_Multicast/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
===================================================================
--- branches/Branch_No_Multicast/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -60,6 +60,7 @@
import org.jboss.security.Util;
import org.jboss.security.auth.callback.JBossCallbackHandler;
import org.jboss.security.integration.JNDIBasedSecurityManagement;
+import org.jboss.security.integration.SecurityConstantsBridge;
/**
* The JaasSecurityDomain is an extension of JaasSecurityManager that addes the notion of a KeyStore, and JSSE
@@ -177,7 +178,7 @@
private String trustStoreProviderArgument;
/** Specify the SecurityManagement instance */
- private ISecurityManagement securityManagement = new JNDIBasedSecurityManagement();
+ private ISecurityManagement securityManagement = SecurityConstantsBridge.getSecurityManagement();
/**
* Creates a default JaasSecurityDomain for with a securityDomain name of 'other'.
Modified: branches/Branch_No_Multicast/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java
===================================================================
--- branches/Branch_No_Multicast/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -49,6 +49,7 @@
import javax.naming.StringRefAddr;
import javax.naming.spi.ObjectFactory;
import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
import javax.security.jacc.PolicyContext;
import org.jboss.logging.Logger;
@@ -127,6 +128,8 @@
/** Frequency of the thread cleaning the authentication cache of expired entries */
private static int defaultCacheFlushPeriod = 60*60;
+ private static JNDIBasedSecurityManagement securityManagement = SecurityConstantsBridge.getSecurityManagement();
+
static
{
// Get a log interface, required for some statics below
@@ -160,7 +163,7 @@
throws ClassNotFoundException, ClassCastException
{
securityMgrClassName = className;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ ClassLoader loader = getContextClassLoader();
securityMgrClass = loader.loadClass(securityMgrClassName);
if( AuthenticationManager.class.isAssignableFrom(securityMgrClass) == false )
throw new ClassCastException(securityMgrClass+" does not implement "+AuthenticationManager.class);
@@ -173,7 +176,7 @@
throws ClassNotFoundException
{
securityProxyFactoryClassName = className;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ ClassLoader loader = getContextClassLoader();
securityProxyFactoryClass = loader.loadClass(securityProxyFactoryClassName);
}
@@ -192,7 +195,7 @@
throws ClassNotFoundException
{
callbackHandlerClassName = className;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ ClassLoader loader = getContextClassLoader();
callbackHandlerClass = loader.loadClass(callbackHandlerClassName);
}
@@ -496,7 +499,14 @@
return null;
}
});
+ CallbackHandler callbackHandler = null;
+ callbackHandler = (CallbackHandler) callbackHandlerClass.newInstance();
+ if (callbackHandler != null)
+ securityManagement.setCallBackHandler(callbackHandler);
}
+
+ // Set AuthenticationManager class
+ securityManagement.setAuthenticationMgrClass(securityMgrClassName);
// Register the Principal property editor
PropertyEditorManager.registerEditor(Principal.class, PrincipalEditor.class);
@@ -764,4 +774,15 @@
return cachePolicy;
}
}
+
+ static ClassLoader getContextClassLoader()
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+ {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
}
Modified: branches/Branch_No_Multicast/server/build.xml
===================================================================
--- branches/Branch_No_Multicast/server/build.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/server/build.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -533,6 +533,7 @@
<!-- Include getopt -->
<zipfileset src="${gnu.getopt.lib}/getopt.jar">
<include name="**"/>
+ <exclude name="META-INF/JBOSSCOD.*"/>
</zipfileset>
</jar>
Modified: branches/Branch_No_Multicast/server/src/etc/conf/all/bootstrap/deployers.xml
===================================================================
--- branches/Branch_No_Multicast/server/src/etc/conf/all/bootstrap/deployers.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/server/src/etc/conf/all/bootstrap/deployers.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -21,7 +21,7 @@
<root>${jboss.lib.url}jboss-dependency.jar</root>
<root>${jboss.lib.url}jboss-kernel.jar</root>
- <!-- Needed for ArchiveForceTempTypeMatcher -->
+ <!-- Needed for ArchiveForceTempTypeMatcher && DefaultManagedObjectCreator -->
<root>${jboss.lib.url}jboss-system.jar</root>
<!-- JAXB impl here, api is in endorsed -->
@@ -51,7 +51,7 @@
<property name="metaValueFactory"><inject bean="MetaValueFactory"/></property>
</bean>
<!-- The ManagedObjectCreator implementation -->
- <bean name="ManagedObjectCreator" class="org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator">
+ <bean name="ManagedObjectCreator" class="org.jboss.deployers.plugins.managed.DefaultManagedObjectCreator">
<property name="mof"><inject bean="ManagedObjectFactory"/></property>
</bean>
Copied: branches/Branch_No_Multicast/server/src/etc/conf/all/bootstrap/security.xml (from rev 106748, branches/JBPAPP_5_1/server/src/etc/conf/all/bootstrap/security.xml)
===================================================================
--- branches/Branch_No_Multicast/server/src/etc/conf/all/bootstrap/security.xml (rev 0)
+++ branches/Branch_No_Multicast/server/src/etc/conf/all/bootstrap/security.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Security bootstrap configuration
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="security-classloader:0.0.0"/></classloader>
+
+ <classloader name="security-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <root>${jboss.lib.url}jbosssx-server.jar</root>
+ <root>${jboss.lib.url}jboss-security-spi.jar</root>
+ <root>${jboss.lib.url}jbosssx.jar</root>
+ <root>${jboss.lib.url}jboss-javaee.jar</root>
+ </classloader>
+
+ <!-- JNDI Based Security Management -->
+ <bean name="JNDIBasedSecurityManagement"
+ class="org.jboss.security.integration.JNDIBasedSecurityManagement"/>
+
+ <bean name="SecurityConstantsBridge" class="org.jboss.security.integration.SecurityConstantsBridge">
+ <property name="securityManagement"><inject bean="JNDIBasedSecurityManagement"/></property>
+ </bean>
+
+ </deployment>
Modified: branches/Branch_No_Multicast/server/src/etc/conf/all/bootstrap.xml
===================================================================
--- branches/Branch_No_Multicast/server/src/etc/conf/all/bootstrap.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/server/src/etc/conf/all/bootstrap.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -12,5 +12,6 @@
<url>bootstrap/jmx.xml</url>
<url>bootstrap/deployers.xml</url>
<url>bootstrap/profile.xml</url>
+ <url>bootstrap/security.xml</url>
</bootstrap>
Modified: branches/Branch_No_Multicast/server/src/etc/conf/minimal/bootstrap.xml
===================================================================
--- branches/Branch_No_Multicast/server/src/etc/conf/minimal/bootstrap.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/server/src/etc/conf/minimal/bootstrap.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -10,5 +10,6 @@
<url>bootstrap/jmx.xml</url>
<url>bootstrap/deployers.xml</url>
<url>bootstrap/profile.xml</url>
+ <url>bootstrap/security.xml</url>
</bootstrap>
Modified: branches/Branch_No_Multicast/system/src/main/org/jboss/deployers/plugins/managed/DefaultManagedObjectCreator.java
===================================================================
--- branches/Branch_No_Multicast/system/src/main/org/jboss/deployers/plugins/managed/DefaultManagedObjectCreator.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/system/src/main/org/jboss/deployers/plugins/managed/DefaultManagedObjectCreator.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -21,16 +21,15 @@
*/
package org.jboss.deployers.plugins.managed;
-import java.util.Arrays;
import java.util.Map;
import java.util.Set;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.logging.Logger;
import org.jboss.managed.api.ManagedObject;
import org.jboss.managed.api.factory.ManagedObjectFactory;
+import org.jboss.managed.plugins.ManagedObjectImpl;
import org.jboss.managed.plugins.factory.ManagedObjectFactoryBuilder;
import org.jboss.metadata.spi.MetaData;
@@ -42,8 +41,20 @@
*/
public class DefaultManagedObjectCreator implements ManagedObjectCreator
{
- private static Logger log = Logger.getLogger(DefaultManagedObjectCreator.class);
+ /** The managed object factory. */
+ private ManagedObjectFactory mof;
+
+ public ManagedObjectFactory getMof()
+ {
+ return mof;
+ }
+
+ public void setMof(ManagedObjectFactory mof)
+ {
+ this.mof = mof;
+ }
+
/**
* Build managed object.
*
@@ -52,24 +63,31 @@
* @throws DeploymentException for any deployment exception
*/
public void build(DeploymentUnit unit, Set<String> attachments, Map<String, ManagedObject> managedObjects)
- throws DeploymentException
+ throws DeploymentException
{
- MetaData metaData = unit.getMetaData();
- if(metaData != null)
+ ManagedObjectFactory factory = mof;
+ if(factory == null )
{
- Object[] all = metaData.getMetaData();
- log.debug("All metaData: " + Arrays.toString(all));
+ factory = ManagedObjectFactoryBuilder.create();
}
- for(String name : attachments)
+
+ final MetaData metaData = unit.getMetaData();
+ for (final String name : attachments)
{
- Object instance = unit.getAttachment(name);
+ final Object instance = unit.getAttachment(name);
if (instance != null)
{
- ManagedObjectFactory factory = ManagedObjectFactoryBuilder.create();
- ManagedObject mo = factory.initManagedObject(instance, metaData);
+ ManagedObject mo = factory.initManagedObject(instance, null, metaData, name, null);
if (mo != null)
- managedObjects.put(mo.getName(), mo);
+ {
+ if (mo instanceof ManagedObjectImpl)
+ {
+ ManagedObjectImpl.class.cast(mo).setAttachmentName(name);
+ }
+ managedObjects.put(name, mo);
+ }
}
}
}
+
}
Modified: branches/Branch_No_Multicast/system/src/main/org/jboss/deployers/plugins/managed/KernelDeploymentManagedObjectCreator.java
===================================================================
--- branches/Branch_No_Multicast/system/src/main/org/jboss/deployers/plugins/managed/KernelDeploymentManagedObjectCreator.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/system/src/main/org/jboss/deployers/plugins/managed/KernelDeploymentManagedObjectCreator.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -25,6 +25,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import org.jboss.beans.metadata.spi.BeanMetaData;
@@ -32,7 +33,6 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
import org.jboss.kernel.spi.deployment.KernelDeployment;
import org.jboss.logging.Logger;
import org.jboss.managed.api.Fields;
@@ -71,6 +71,31 @@
this.mof = mof;
}
+ public void build(DeploymentUnit unit, Set<String> attachments, Map<String, ManagedObject> managedObjects) throws DeploymentException
+ {
+ // Handle multiple kernel deployments
+ for(final Entry<String, Object> entry : unit.getAttachments().entrySet())
+ {
+ if(KernelDeployment.class.isInstance(entry.getValue()))
+ {
+ final KernelDeployment deployment = KernelDeployment.class.cast(entry.getValue());
+ ManagedObject deploymentMO = managedObjects.get(entry.getKey());
+ if(deploymentMO == null)
+ {
+ // allowMultipleAttachments
+ deploymentMO = mof.createManagedObject(deployment.getClass());
+ managedObjects.put(entry.getKey(), deploymentMO);
+ }
+ if(deploymentMO instanceof MutableManagedObject)
+ ((MutableManagedObject) deploymentMO).setName(KernelDeployment.class.getName());
+ if(deploymentMO instanceof ManagedObjectImpl)
+ ((ManagedObjectImpl) deploymentMO).setAttachmentName(entry.getKey());
+ // Build the BMD MO components
+ build(unit, deployment, deploymentMO, managedObjects);
+ }
+ }
+ }
+
/**
* Called by the KernelDeploymentDeployer to update the ManagedObjects map
* created by the default ManagedObjectCreator.
@@ -79,40 +104,18 @@
* @param managedObjects map of managed objects
* @throws DeploymentException for any deployment exception
*/
- public void build(DeploymentUnit unit, Set<String> attachments, Map<String, ManagedObject> managedObjects) throws DeploymentException
+ public void build(DeploymentUnit unit, KernelDeployment deployment, ManagedObject deploymentMO, Map<String, ManagedObject> managedObjects) throws DeploymentException
{
- KernelDeployment deployment = unit.getAttachment(KernelDeployment.class);
- if(deployment == null)
- return;
-
List<BeanMetaDataFactory> beanFactories = deployment.getBeanFactories();
- // Get the KernelDeployment ManagedObject
- ManagedObject deploymentMO = managedObjects.get(KernelDeployment.class.getName());
- if(deploymentMO == null)
- {
- // Check for the KernelDeployment impl name
- deploymentMO = managedObjects.get(AbstractKernelDeployment.class.getName());
- if(deploymentMO == null)
- {
- // Should not happen?
- deploymentMO = mof.createManagedObject(deployment.getClass());
- }
- else
- {
- // Put the MO under the attachment interface name
- managedObjects.remove(AbstractKernelDeployment.class.getName());
- }
- managedObjects.put(KernelDeployment.class.getName(), deploymentMO);
- }
- if(deploymentMO instanceof MutableManagedObject)
- ((MutableManagedObject) deploymentMO).setName(KernelDeployment.class.getName());
- if(deploymentMO instanceof ManagedObjectImpl)
- ((ManagedObjectImpl) deploymentMO).setAttachmentName(KernelDeployment.class.getName());
-
MetaData metaData = unit.getMetaData();
// Update the beanFactories value to a list of BeanMetaDataFactory with BeanMetaDatas
ManagedProperty beanFactoriesMP = deploymentMO.getProperty("beanFactories");
+ // In case of e.g. AOPDeployment
+ if(beanFactoriesMP == null)
+ {
+ return;
+ }
List<GenericValue> tmpBFs = new ArrayList<GenericValue>();
CollectionMetaType beansFactoryType = new CollectionMetaType(BeanMetaDataFactory.class.getName(), AbstractManagedObjectFactory.MANAGED_OBJECT_META_TYPE);
if(beanFactories != null)
Modified: branches/Branch_No_Multicast/system/src/main/org/jboss/system/server/profileservice/attachments/AttachmentMetaData.java
===================================================================
--- branches/Branch_No_Multicast/system/src/main/org/jboss/system/server/profileservice/attachments/AttachmentMetaData.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/system/src/main/org/jboss/system/server/profileservice/attachments/AttachmentMetaData.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -21,6 +21,9 @@
*/
package org.jboss.system.server.profileservice.attachments;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
@@ -89,5 +92,16 @@
{
this.attachment = attachment;
}
+
+ public static String getEncodedAttachmentName(String name) throws Exception
+ {
+ return URLEncoder.encode(name, "UTF-8");
+ }
+
+ public static String getDecodedAttachmentName(String name) throws Exception
+ {
+ return URLDecoder.decode(name, "UTF-8");
+ }
+
}
Modified: branches/Branch_No_Multicast/system/src/main/org/jboss/system/server/profileservice/persistence/deployer/PersistenceModificationChecker.java
===================================================================
--- branches/Branch_No_Multicast/system/src/main/org/jboss/system/server/profileservice/persistence/deployer/PersistenceModificationChecker.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/system/src/main/org/jboss/system/server/profileservice/persistence/deployer/PersistenceModificationChecker.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -21,6 +21,8 @@
*/
package org.jboss.system.server.profileservice.persistence.deployer;
+import java.io.File;
+import java.io.FileFilter;
import java.io.IOException;
import java.util.List;
@@ -28,9 +30,6 @@
import org.jboss.deployers.spi.structure.StructureMetaData;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.logging.Logger;
-import org.jboss.system.server.profile.basic.XmlIncludeVirtualFileFilter;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -43,18 +42,30 @@
private static final Logger log = Logger.getLogger(PersistenceModificationChecker.class);
/** The filter. */
- private static VirtualFileFilter filter = new XmlIncludeVirtualFileFilter();
+ private static FileFilter filter = new ExcludeFilter();
public static boolean hasBeenModified(VFSDeploymentUnit unit, long lastModified) throws Exception
{
- VirtualFile root = unit.getRoot();
- if (root.isArchive() || root.isLeaf())
+ final File file = new File(unit.getRoot().toURL().getPath());
+ if(file.exists() == false)
{
- if(root.getLastModified() > lastModified)
+ if(unit.isTopLevel() == false)
+ {
+ return false;
+ }
+ throw new IllegalStateException("deployment file does not exist " + file);
+ }
+ // Archive
+ if (file.isFile())
+ {
+ log.info(file + " " + file.lastModified() + " // " + lastModified);
+ if(file.lastModified() > lastModified)
return true;
+
+ return false;
}
-
- StructureMetaData structureMetaData = unit.getAttachment(StructureMetaData.class);
+ // Structure
+ final StructureMetaData structureMetaData = unit.getAttachment(StructureMetaData.class);
if(structureMetaData == null)
return false;
@@ -65,25 +76,25 @@
if(info == null)
return false;
- return hasBeenModifed(root, info, lastModified);
+ return hasBeenModifed(file, info, lastModified);
}
- protected static boolean hasBeenModifed(VirtualFile root, ContextInfo contextInfo, long lastModified) throws IOException
+ protected static boolean hasBeenModifed(final File root, final ContextInfo contextInfo, long lastModified) throws IOException
{
List<String> metadataPaths = contextInfo.getMetaDataPath();
if (metadataPaths != null && metadataPaths.isEmpty() == false)
{
for (String metaDataPath : metadataPaths)
{
- VirtualFile mdpVF = root.getChild(metaDataPath);
+ File mdpVF = new File(root, metaDataPath);
if (mdpVF != null)
{
- List<VirtualFile> children = mdpVF.getChildren(filter);
- if (children != null && children.isEmpty() == false)
+ File[] children = mdpVF.listFiles(filter);
+ if (children != null && children.length > 0)
{
- for (VirtualFile child : children)
+ for (File child : children)
{
- if (child.getLastModified() > lastModified)
+ if (child.lastModified() > lastModified)
{
if (log.isTraceEnabled())
log.trace("Metadata location modified: " + child);
@@ -96,5 +107,14 @@
}
return false;
}
+
+ protected static class ExcludeFilter implements FileFilter
+ {
+ public boolean accept(File pathname)
+ {
+ return pathname.getName().endsWith(".xml");
+ }
+ }
+
}
Modified: branches/Branch_No_Multicast/system/src/main/org/jboss/system/server/profileservice/repository/AbstractAttachmentStore.java
===================================================================
--- branches/Branch_No_Multicast/system/src/main/org/jboss/system/server/profileservice/repository/AbstractAttachmentStore.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/system/src/main/org/jboss/system/server/profileservice/repository/AbstractAttachmentStore.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -269,7 +269,7 @@
attachment.setClassName(managedObject.getAttachment().getClass().getName());
// Save the attachment
- String attachmentPath = deploymentPath + attachment.getName();
+ String attachmentPath = deploymentPath + HashGenerator.createHash(attachment.getName());
// Create the persistence information
PersistenceRoot persistenceRoot = getSerializer().loadAttachment(attachmentPath, PersistenceRoot.class);
//
@@ -327,8 +327,14 @@
String deploymentPath = createRelativeDeploymentPath(deploymentCtx);
// Load
- String attachmentPath = deploymentPath + attachment.getName();
- return getSerializer().loadAttachment(attachmentPath, PersistenceRoot.class);
+ String attachmentPath = deploymentPath + HashGenerator.createHash(attachment.getName());
+ PersistenceRoot root = getSerializer().loadAttachment(attachmentPath, PersistenceRoot.class);
+ if(root == null)
+ {
+ attachmentPath = deploymentPath + attachment.getName();
+ root = getSerializer().loadAttachment(attachmentPath, PersistenceRoot.class);
+ }
+ return root;
}
/**
Modified: branches/Branch_No_Multicast/system/src/main/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java
===================================================================
--- branches/Branch_No_Multicast/system/src/main/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/system/src/main/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -207,7 +207,8 @@
catch (IOException ignored)
{
}
- }
+ }
+ contentFile.setLastModified(System.currentTimeMillis());
}
// Get the vfs uri and add the VFS uri to the cached VFS uris
Modified: branches/Branch_No_Multicast/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java
===================================================================
--- branches/Branch_No_Multicast/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -24,11 +24,20 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.deployer.JAXPDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.managed.api.ManagedObject;
+import org.jboss.managed.api.factory.ManagedObjectFactory;
+import org.jboss.managed.plugins.ManagedObjectImpl;
+import org.jboss.managed.plugins.factory.ManagedObjectFactoryBuilder;
import org.jboss.system.metadata.ServiceDeployment;
import org.jboss.system.metadata.ServiceDeploymentClassPath;
import org.jboss.system.metadata.ServiceDeploymentParser;
@@ -55,8 +64,12 @@
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
* @version $Revision$
*/
-public class SARDeployer extends JAXPDeployer<ServiceDeployment>
+public class SARDeployer extends JAXPDeployer<ServiceDeployment> implements ManagedObjectCreator
{
+
+ /** The managed object factory. */
+ private static final ManagedObjectFactory factory = ManagedObjectFactoryBuilder.create();
+
/**
* Create a new SARDeployer.
*
@@ -185,4 +198,37 @@
}
return original;
}
+
+ /**
+ * {@inheritDoc}
+ *
+ * handle multiple attachments
+ *
+ */
+ public void build(DeploymentUnit unit, Set<String> attachmentNames, Map<String, ManagedObject> managedObjects)
+ throws DeploymentException
+ {
+ for(final Entry<String, Object> entry : unit.getAttachments().entrySet())
+ {
+ final String key = entry.getKey();
+ if(ServiceDeployment.class.isInstance(entry.getValue()))
+ {
+ ManagedObject mo = managedObjects.get(key);
+ if(mo == null)
+ {
+ // allowMultipleAttachments
+ mo = factory.initManagedObject(entry.getValue(), null, unit.getMetaData(), key, null);
+ if (mo != null)
+ {
+ if (mo instanceof ManagedObjectImpl)
+ {
+ ManagedObjectImpl.class.cast(mo).setAttachmentName(key);
+ }
+ managedObjects.put(key, mo);
+ }
+ }
+ }
+ }
+ }
+
}
Modified: branches/Branch_No_Multicast/testsuite/build.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/build.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/testsuite/build.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -584,12 +584,12 @@
<!-- path refid="jboss.profileservice.classpath"/ -->
<pathelement path="${jboss.dist.common.lib}/jboss-profileservice.jar" />
<!-- path refid="jboss.jboss.security.spi.classpath"/ -->
- <pathelement path="${jboss.dist.client}/jboss-security-spi.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-security-spi.jar" />
<!-- jbosssx.jar -->
<!-- path refid="jboss.jbosssx.classpath"/ -->
- <pathelement path="${jboss.dist.common.lib}/jbosssx.jar" />
+ <pathelement path="${jboss.dist.lib}/jbosssx.jar" />
<!-- path refid="jboss.security.int.classpath"/ -->
- <pathelement path="${jboss.dist.common.lib}/jbosssx-server.jar" />
+ <pathelement path="${jboss.dist.lib}/jbosssx-server.jar" />
<!-- path refid="jboss.server.classpath"/ -->
<pathelement path="${jboss.dist.common.lib}/jboss.jar" />
<pathelement path="${jboss.dist.common.lib}/jmx-adaptor-plugin.jar" />
@@ -1300,7 +1300,7 @@
<include name="org/jboss/test/deployers/sar/test/*UnitTestCase.class"/>
<include name="org/jboss/test/deployers/web/test/*UnitTestCase.class"/>
<include name="org/jboss/test/deployers/jbas2904/test/*UnitTestCase.class"/>
- <include name="org/jboss/test/deployers/seam/test/SeamDvdExampleUnitTestCase.class"/>
+ <include name="org/jboss/test/deployers/seam/test/SeamDvdstoreExampleUnitTestCase.class"/>
<include name="org/jboss/test/deployers/seam/test/SeamNumberguessExampleUnitTestCase.class"/>
<include name="org/jboss/test/deployers/seam/test/SeamVFSClassloadingUnitTestCase.class"/>
</patternset>
@@ -1383,7 +1383,7 @@
<exclude name="org/jboss/test/web/test/WebIntegrationUnitTestCase.class" if="build.ewp"/>
<!-- EWP doesn't ships bsh.jar -->
- <exclude name="org/jboss/test/deployers/seam/test/SeamDvdExampleUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/deployers/seam/test/SeamDvdstoreExampleUnitTestCase.class" if="build.ewp"/>
<!-- EWP doesn't ships management console (console-mgr.sar) -->
<exclude name="org/jboss/test/console/jbas3861/*.class" if="build.ewp"/>
Modified: branches/Branch_No_Multicast/testsuite/imports/sections/profileservice.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/imports/sections/profileservice.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/testsuite/imports/sections/profileservice.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -94,7 +94,9 @@
<include name="testWarDeployment.war"/>
</fileset>
</jar>
+ <jar destfile="${build.lib}/profileservice-test.jar">
+ <fileset dir="${build.resources}/profileservice/override/profileservice-test.jar" />
+ </jar>
-
</target>
</project>
Modified: branches/Branch_No_Multicast/testsuite/imports/sections/seam.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/imports/sections/seam.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/testsuite/imports/sections/seam.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -1,6 +1,6 @@
<project name="tests-seam-jars" xmlns:artifact="urn:maven-artifact-ant">
- <property name="seam_version" value="2.1.0.GA"/>
+ <property name="seam_version" value="2.2.2.EAP5"/>
<target name="_jars-seam">
@@ -11,10 +11,11 @@
<artifact:dependencies filesetId="examples.fileset" versionsId="examples.versions">
<dependency groupId="org.jboss.seam.examples" artifactId="jboss-seam-booking" version="${seam_version}" type="ear"/>
<dependency groupId="org.jboss.seam.examples" artifactId="jboss-seam-booking" version="${seam_version}" type="xml" classifier="ds"/>
- <dependency groupId="org.jboss.seam.examples" artifactId="jboss-seam-dvd" version="${seam_version}" type="ear"/>
- <dependency groupId="org.jboss.seam.examples" artifactId="jboss-seam-dvd" version="${seam_version}" type="xml" classifier="ds"/>
+ <dependency groupId="org.jboss.seam.examples" artifactId="jboss-seam-dvdstore" version="${seam_version}" type="ear"/>
+ <dependency groupId="org.jboss.seam.examples" artifactId="jboss-seam-dvdstore" version="${seam_version}" type="xml" classifier="ds"/>
<dependency groupId="org.jboss.seam.examples" artifactId="jboss-seam-numberguess" version="${seam_version}" type="ear"/>
<dependency groupId="org.jboss.seam.examples" artifactId="jboss-seam-jpa" version="${seam_version}" type="war"/>
+ <remoterepository id="prod-repository.jboss.org" url="http://repository.jboss.org/maven2-brew"/>
<remoterepository id="repository.jboss.org" url="http://repository.jboss.org/maven2"/>
<remoterepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2"/>
</artifact:dependencies>
Deleted: branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamDvdExampleUnitTestCase.java
===================================================================
--- branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamDvdExampleUnitTestCase.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamDvdExampleUnitTestCase.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.deployers.seam.test;
-
-import junit.framework.Test;
-
-/**
- * Test Seam Dvd example.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class SeamDvdExampleUnitTestCase extends SeamExampleTest
-{
- public SeamDvdExampleUnitTestCase(String test)
- {
- super(test);
- }
-
- public static Test suite() throws Exception
- {
- return deploy(SeamDvdExampleUnitTestCase.class);
- }
-}
Copied: branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamDvdstoreExampleUnitTestCase.java (from rev 106748, branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamDvdstoreExampleUnitTestCase.java)
===================================================================
--- branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamDvdstoreExampleUnitTestCase.java (rev 0)
+++ branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamDvdstoreExampleUnitTestCase.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.deployers.seam.test;
+
+import junit.framework.Test;
+
+/**
+ * Test Seam Dvd Store example.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class SeamDvdstoreExampleUnitTestCase extends SeamExampleTest
+{
+ public SeamDvdstoreExampleUnitTestCase(String test)
+ {
+ super(test);
+ }
+
+ public static Test suite() throws Exception
+ {
+ return deploy(SeamDvdstoreExampleUnitTestCase.class);
+ }
+}
Modified: branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/deployers/test/DeploymentManagerUnitTestCase.java
===================================================================
--- branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/deployers/test/DeploymentManagerUnitTestCase.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/deployers/test/DeploymentManagerUnitTestCase.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -97,6 +97,7 @@
// disable stopped check, as it was started before
start = distributeAndStart(NESTED_DEPLOYMENT, deploymentName, true, false);
assertComplete(start);
+ assertDeploymentState(start.getDeploymentID(), DeploymentState.STARTED);
Thread.sleep(5);
@@ -178,8 +179,10 @@
try
{
// Test exploded
- distributeAndStart(NESTED_DEPLOYMENT, deploymentName,
+ DeploymentProgress start = distributeAndStart(NESTED_DEPLOYMENT, deploymentName,
new DeploymentOption[] { DeploymentOption.Explode});
+ assertComplete(start);
+ assertDeploymentState(start.getDeploymentID(), DeploymentState.STARTED);
// Test fail if exists
DeploymentProgress override = getDeploymentManager().distribute(deploymentName,
Modified: branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/jca/test/BackgroundValidationUnitTestCase.java
===================================================================
--- branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/jca/test/BackgroundValidationUnitTestCase.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/jca/test/BackgroundValidationUnitTestCase.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -90,8 +90,8 @@
assertTrue("Background validation ran. Destroyed count should exceed zero.", destroyedCount.intValue() > 0);
Integer connCount = PoolHelper.getConnectionCount(getServer(), INVALID_BACKGROUND_POOL);
-
- assertTrue(connCount.intValue() == minCount.intValue());
+
+ //assertTrue(connCount.intValue() == minCount.intValue());
PoolHelper.setPoolAttributeAndFlush(getServer(), INVALID_BACKGROUND_POOL, PoolHelper.POOL_ATT_BACKGROUND_VAL_MILLIS, new Long(0));
Modified: branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/JmsDestinationRestartUnitTestCase.java
===================================================================
--- branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/JmsDestinationRestartUnitTestCase.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/JmsDestinationRestartUnitTestCase.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -41,7 +41,6 @@
import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.metatype.plugins.types.MutableCompositeMetaType;
import org.jboss.test.profileservice.override.test.AbstractProfileServiceTest;
-import org.jboss.test.profileservice.override.test.JmsDestinationOverrideTestCase;
import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
@@ -162,6 +161,26 @@
}
}
+ public void testSar() throws Exception
+ {
+ final String deploymentName = "profileservice-test.jar";
+ try
+ {
+ deployPackage(deploymentName);
+ ManagementView mgtView = getManagementView();
+
+ ManagedComponent queue = mgtView.getComponent("otherTestQueue", KnownComponentTypes.JMSDestination.Queue.getType());
+ assertNotNull(queue);
+
+ ManagedComponent topic = mgtView.getComponent("otherTestTopic", KnownComponentTypes.JMSDestination.Topic.getType());
+ assertNotNull(topic);
+ }
+ finally
+ {
+ undeployPackage(new String[] { deploymentName });
+ }
+ }
+
protected CompositeValue createCompositeValue(Boolean read, Boolean write, Boolean create)
{
Map<String, MetaValue> map = new HashMap<String, MetaValue>();
Modified: branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java
===================================================================
--- branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java 2010-07-15 14:29:25 UTC (rev 106749)
@@ -239,6 +239,31 @@
}
}
+ public void testSar() throws Exception
+ {
+ final String deploymentName = "profileservice-test.jar";
+ try
+ {
+ deployPackage(deploymentName);
+ ManagementView mgtView = getManagementView();
+
+ ManagedComponent queue = mgtView.getComponent("otherTestQueue", QueueType);
+ assertNotNull(queue);
+ queue.getProperty("downCacheSize").setValue(SimpleValueSupport.wrap(3000));
+
+ ManagedComponent topic = mgtView.getComponent("otherTestTopic", TopicType);
+ assertNotNull(topic);
+ topic.getProperty("downCacheSize").setValue(SimpleValueSupport.wrap(3000));
+
+ mgtView.updateComponent(queue);
+ mgtView.updateComponent(topic);
+ }
+ catch(Exception e)
+ {
+ throw e;
+ }
+ }
+
protected CompositeValue createCompositeValue(Boolean read, Boolean write, Boolean create)
{
Map<String, MetaValue> map = new HashMap<String, MetaValue>();
Copied: branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar (from rev 106748, branches/JBPAPP_5_1/testsuite/src/resources/profileservice/override/profileservice-test.jar)
Copied: branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF (from rev 106748, branches/JBPAPP_5_1/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF)
Deleted: branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testQueue-service.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testQueue-service.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testQueue-service.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<server>
- <mbean xmbean-dd="xmdesc/Queue-xmbean.xml"
- name="jboss.messaging.destination:service=Queue,name=otherTestQueue"
- code="org.jboss.jms.server.destination.QueueService">
-
- <attribute name="JNDIName">otherTestQueue</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
-</server>
Copied: branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testQueue-service.xml (from rev 106748, branches/JBPAPP_5_1/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testQueue-service.xml)
===================================================================
--- branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testQueue-service.xml (rev 0)
+++ branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testQueue-service.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<server>
+ <mbean xmbean-dd="xmdesc/Queue-xmbean.xml"
+ name="jboss.messaging.destination:service=Queue,name=otherTestQueue"
+ code="org.jboss.jms.server.destination.QueueService">
+
+ <attribute name="JNDIName">otherTestQueue</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+</server>
Deleted: branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testTopic-service.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testTopic-service.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testTopic-service.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<server>
- <mbean xmbean-dd="xmdesc/Topic-xmbean.xml"
- name="jboss.messaging.destination:service=Topic,name=otherTestTopic"
- code="org.jboss.jms.server.destination.TopicService">
-
- <attribute name="JNDIName">otherTestTopic</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
-</server>
Copied: branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testTopic-service.xml (from rev 106748, branches/JBPAPP_5_1/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testTopic-service.xml)
===================================================================
--- branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testTopic-service.xml (rev 0)
+++ branches/Branch_No_Multicast/testsuite/src/resources/profileservice/override/profileservice-test.jar/META-INF/testTopic-service.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<server>
+ <mbean xmbean-dd="xmdesc/Topic-xmbean.xml"
+ name="jboss.messaging.destination:service=Topic,name=otherTestTopic"
+ code="org.jboss.jms.server.destination.TopicService">
+
+ <attribute name="JNDIName">otherTestTopic</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+</server>
Modified: branches/Branch_No_Multicast/tools/etc/buildmagic/build-common.xml
===================================================================
--- branches/Branch_No_Multicast/tools/etc/buildmagic/build-common.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/tools/etc/buildmagic/build-common.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -3,6 +3,7 @@
<!-- Make sure we have the right version of Ant -->
<property name="buildmagic.ant16.baseversion" value="1.6"/>
<property name="buildmagic.ant17.baseversion" value="1.7"/>
+ <property name="buildmagic.ant18.baseversion" value="1.8"/>
<!--
| Add new conditions for other supported Ant versions when they
@@ -15,6 +16,8 @@
substring="Ant version ${buildmagic.ant16.baseversion}"/>
<contains string="${ant.version}"
substring="Ant version ${buildmagic.ant17.baseversion}"/>
+ <contains string="${ant.version}"
+ substring="Ant version ${buildmagic.ant18.baseversion}"/>
</or>
</condition>
Modified: branches/Branch_No_Multicast/varia/build.xml
===================================================================
--- branches/Branch_No_Multicast/varia/build.xml 2010-07-15 14:07:21 UTC (rev 106748)
+++ branches/Branch_No_Multicast/varia/build.xml 2010-07-15 14:29:25 UTC (rev 106749)
@@ -508,6 +508,8 @@
<include name="org/jboss/ant/**"/>
</fileset>
<zipfileset src="${jboss.jnpserver.lib}/jnpserver.jar">
+ <exclude name="META-INF/INDEX.LIST"/>
+ <exclude name="META-INF/JBOSSCOD.*"/>
</zipfileset>
<fileset dir="${jboss.server.root}/classes">
<include name="org/jboss/jmx/adaptor/rmi/RMIAdaptor.class"/>
More information about the jboss-cvs-commits
mailing list