();
list = (NodeList) (XPATH.evaluate(OPERATIONS, authorizationTarget, XPathConstants.NODESET));
if (list.getLength() == 0) {
@@ -116,7 +116,7 @@
final int count = list.getLength();
for (int index = 0; index < count; index++) {
Operation op = parseOperation(list.item(index), objectName);
- operations.put(op.getName(), op);
+ operations.add(op);
}
return new AuthorizationTarget(objectName, operations);
Modified: branches/JBPAPP_5/server/src/main/org/jboss/jmx/connector/invoker/authorization/roles/RolesAuthorization.java
===================================================================
--- branches/JBPAPP_5/server/src/main/org/jboss/jmx/connector/invoker/authorization/roles/RolesAuthorization.java 2013-12-17 16:07:03 UTC (rev 114606)
+++ branches/JBPAPP_5/server/src/main/org/jboss/jmx/connector/invoker/authorization/roles/RolesAuthorization.java 2013-12-18 08:20:34 UTC (rev 114607)
@@ -22,10 +22,12 @@
package org.jboss.jmx.connector.invoker.authorization.roles;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.security.Principal;
import java.security.acl.Group;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -36,6 +38,8 @@
import javax.management.ObjectName;
import javax.security.auth.Subject;
+import org.jboss.security.SimpleGroup;
+
/**
* Roles based authorization. This is advanced version of {@link org.jboss.jmx.connector.invoker.RolesAuthorization}. It
* provides fine grained check against:
@@ -45,11 +49,35 @@
* user role - determines( just like {@link org.jboss.jmx.connector.invoker.RolesAuthorization}) if current subject has
* required role.
*
- * This allows to define per role access level to certain MBeans and their methods. This implementation does not support wild
- * cards. It requires strict rules definition. If no rule is defined for target/method - it will deny access. Default
- * implementation requires configuration file(jmx-security-roles.xml) to be present in
- * $JBOSS_HOME/server/${node}/conf.
+ * This allows to define per role access level to certain MBeans and their methods. Default implementation requires
+ * configuration file(jmx-security-roles.xml) to be present in $JBOSS_HOME/server/${node}/conf.
* Configuration file format looks as follows:
+ *
+ *
+ * Note that 'wildcards' are supported. Valid MBean names:
+ *
+ * - jboss:type=simple
+ * - jboss:type=*
+ * - jboss:*
+ *
+ *
+ * Operation names support regular expression, valid operation names:
+ *
+ * - invoke
+ * - get*
+ * - getData
+ *
+ *
+ * Be aware that this implementation considers rules as chains. This means that order of rule definition is important, in case
+ * of operation name and MBean name.
+ * If authorization-target(3) MBean name match desired name, the authorization-target(4) is not processed, even though it may
+ * match MBean name:
+ * desired name: jboss:data=simple,name=myname
+ * authorization-target(3): jboss:data=simple,*
+ * authorization-target(4): jboss:*
+ * Operation name match works in similar way.
+ *
+ * Example configuration entry:
*
*
* <authorization-rules>
@@ -96,9 +124,9 @@
*/
public class RolesAuthorization {
- private static final String CONFIGURATION_FILE = "jmx-security-roles.xml";
+ protected static final String CONFIGURATION_FILE = "jmx-security-roles.xml";
- private final Map oname2Authorization = new HashMap();
+ private List authorizationTargets;
/**
*
@@ -109,11 +137,11 @@
}
public void authorize(Principal caller, Subject subject, String objectname, String opname) {
- Set groups = subject.getPrincipals(Group.class);
+ final Set groups = subject.getPrincipals(Group.class);
Group roles = null;
- Iterator iter = groups.iterator();
+ final Iterator iter = groups.iterator();
while (iter.hasNext()) {
- Group grp = (Group) iter.next();
+ Group grp = iter.next();
if (grp.getName().equals("Roles")) {
roles = grp;
break;
@@ -123,10 +151,9 @@
throw new SecurityException("Subject has no Roles, there is no way to assert access privilege!");
}
- AuthorizationTarget target = matchTraget(objectname);
+ final AuthorizationTarget target = matchTraget(objectname);
+ final Operation operation = target.matchOperation(opname);
- Operation operation = target.matchOperation(opname);
-
operation.assertPrivilege(roles);
}
@@ -140,7 +167,14 @@
} catch (NullPointerException e) {
throw new SecurityException("Malformed taget name: '" + objectName + "'");
}
- AuthorizationTarget target = this.oname2Authorization.get(name);
+ AuthorizationTarget target = null;
+ for (int index = 0; index < this.authorizationTargets.size(); index++) {
+ AuthorizationTarget at = this.authorizationTargets.get(index);
+ if (at.getObjectName().apply(name)) {
+ target = at;
+ break;
+ }
+ }
if (target == null) {
throw new SecurityException("No rules defined for: '" + objectName + "'");
@@ -151,21 +185,25 @@
protected void configure() throws Exception {
InputStream is = null;
try {
- is = Thread.currentThread().getContextClassLoader().getResourceAsStream(CONFIGURATION_FILE);
- if (is == null) {
- throw new IOException("Failed to read configuration file '" + CONFIGURATION_FILE
- + "' from server 'conf' directory!");
- }
- List targets = Parser.parse(is);
- for (AuthorizationTarget t : targets) {
- this.oname2Authorization.put(t.getObjectName(), t);
- }
+ is = this.getConfigurationStream();
+ this.authorizationTargets = Parser.parse(is);
} finally {
- if(is != null){
- try{
+ if (is != null) {
+ try {
is.close();
- }catch(Exception e){}
+ } catch (Exception e) {
+ }
}
}
}
+
+ protected InputStream getConfigurationStream() throws Exception {
+ InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(CONFIGURATION_FILE);
+ if (is == null) {
+ throw new IOException("Failed to read configuration file '" + CONFIGURATION_FILE
+ + "' from server 'conf' directory!");
+ }
+ return is;
+
+ }
}
\ No newline at end of file
Added: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jmx/invoker/authorization/RolesAuthorizationTestCase.java
===================================================================
--- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jmx/invoker/authorization/RolesAuthorizationTestCase.java (rev 0)
+++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jmx/invoker/authorization/RolesAuthorizationTestCase.java 2013-12-18 08:20:34 UTC (rev 114607)
@@ -0,0 +1,200 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat, Inc., 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.jmx.invoker.authorization;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.security.Principal;
+import java.security.acl.Group;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.security.auth.Subject;
+
+import org.jboss.jmx.connector.invoker.authorization.roles.RolesAuthorization;
+import org.jboss.security.SimpleGroup;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * @author baranowb
+ *
+ */
+public class RolesAuthorizationTestCase extends JBossTestCase {
+ private RolesAuthorization authorization;
+
+ /**
+ * @param name
+ */
+ public RolesAuthorizationTestCase(String name) {
+ super(name);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ this.authorization = new RolesAuthorization() {
+ @Override
+ protected InputStream getConfigurationStream() throws Exception {
+ return new FileInputStream(new File(".." + File.separator + "src" + File.separator + "main" + File.separator
+ + "org" + File.separator + "jboss" + File.separator + "test" + File.separator + "jmx" + File.separator
+ + "invoker" + File.separator + "authorization" + File.separator + super.CONFIGURATION_FILE));
+ }
+
+ };
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ this.authorization = null;
+ super.tearDown();
+ }
+
+ public void testAuthorization() throws Exception {
+ final String objectName = "jboss:service=JNDIView";
+ final String opName = "list";
+ final Principal caller = new SimplePrincipal("test");
+ // yeah, this is stupid
+ final Group group = new SimpleGroup("Roles");
+ group.addMember(new SimplePrincipal("Tester"));
+ final Set callers = new HashSet();
+ callers.add(caller);
+ callers.add(group);
+ final Subject subject = new Subject(false, callers, new HashSet(), new HashSet());
+ authorization.authorize(caller, subject, objectName, opName);
+ }
+
+ public void testWildarcMatch() throws Exception {
+ final String objectName = "jboss:service=NO_BOOM";
+ final String opName = "list";
+ final Principal caller = new SimplePrincipal("test");
+ // yeah, this is stupid
+ final Group group = new SimpleGroup("Roles");
+ group.addMember(new SimplePrincipal("Tester"));
+ final Set callers = new HashSet();
+ callers.add(caller);
+ callers.add(group);
+ final Subject subject = new Subject(false, callers, new HashSet(), new HashSet());
+ try {
+ authorization.authorize(caller, subject, objectName, opName);
+ } catch (SecurityException se) {
+ fail("Did not expect exception");
+ }
+ }
+ public void testWildarcMatch_2() throws Exception {
+ //this is ! to testNoRule_3
+ final String objectName = "jboss:type=NO_BOOM";
+ final String opName = "getSomeThingThatDoesNotExist";
+ final Principal caller = new SimplePrincipal("test");
+ // yeah, this is stupid
+ final Group group = new SimpleGroup("Roles");
+ group.addMember(new SimplePrincipal("Tester"));
+ final Set callers = new HashSet();
+ callers.add(caller);
+ callers.add(group);
+ final Subject subject = new Subject(false, callers, new HashSet(), new HashSet());
+ try {
+ authorization.authorize(caller, subject, objectName, opName);
+ } catch (SecurityException se) {
+ fail("Did not expect exception");
+ }
+ }
+ public void testNoRule() throws Exception {
+ final String objectName = "jboss:service=BOOM";
+ final String opName = "list";
+ final Principal caller = new SimplePrincipal("test");
+ // yeah, this is stupid
+ final Group group = new SimpleGroup("Roles");
+ group.addMember(new SimplePrincipal("JBossAdmin"));
+ final Set callers = new HashSet();
+ callers.add(caller);
+ callers.add(group);
+ final Subject subject = new Subject(false, callers, new HashSet(), new HashSet());
+ try {
+ authorization.authorize(caller, subject, objectName, opName);
+ fail("Expected SecurityException since there is no rule!");
+ } catch (SecurityException se) {
+ //
+ }
+ }
+
+ public void testNoRule_2() throws Exception {
+ final String objectName = "wicked_domain:service=BOOM";
+ final String opName = "list";
+ final Principal caller = new SimplePrincipal("test");
+ // yeah, this is stupid
+ final Group group = new SimpleGroup("Roles");
+ group.addMember(new SimplePrincipal("JBossAdmin"));
+ final Set callers = new HashSet();
+ callers.add(caller);
+ callers.add(group);
+ final Subject subject = new Subject(false, callers, new HashSet(), new HashSet());
+ try {
+ authorization.authorize(caller, subject, objectName, opName);
+ fail("Expected SecurityException since there is no rule!");
+ } catch (SecurityException se) {
+ //
+ }
+ }
+
+ public void testNoRule_3() throws Exception {
+ //test if first rule op def will match - it has only Tester role.
+ //second rule should never be triggered
+ final String objectName = "jboss:type=NO_BOOM";
+ final String opName = "getSomeThingThatDoesNotExist";
+ final Principal caller = new SimplePrincipal("test");
+ // yeah, this is stupid
+ final Group group = new SimpleGroup("Roles");
+ group.addMember(new SimplePrincipal("JBossAdmin"));
+ final Set callers = new HashSet();
+ callers.add(caller);
+ callers.add(group);
+ final Subject subject = new Subject(false, callers, new HashSet(), new HashSet());
+ try {
+ authorization.authorize(caller, subject, objectName, opName);
+ fail("Expected SecurityException since there is no rule!");
+ } catch (SecurityException se) {
+ //
+ }
+ }
+
+ public void testAuthorizationFailure() throws Exception {
+ final String objectName = "jboss:service=JNDIView";
+ final String opName = "list";
+ final Principal caller = new SimplePrincipal("test");
+ // yeah, this is stupid
+ final Group group = new SimpleGroup("Roles");
+ group.addMember(new SimplePrincipal("IWillBoom"));
+ final Set callers = new HashSet();
+ callers.add(caller);
+ callers.add(group);
+ final Subject subject = new Subject(false, callers, new HashSet(), new HashSet());
+ try {
+ authorization.authorize(caller, subject, objectName, opName);
+ fail("Expected SecurityException since there is no role!");
+ } catch (SecurityException se) {
+ //
+ }
+ }
+}
Added: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jmx/invoker/authorization/jmx-security-roles.xml
===================================================================
--- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jmx/invoker/authorization/jmx-security-roles.xml (rev 0)
+++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jmx/invoker/authorization/jmx-security-roles.xml 2013-12-18 08:20:34 UTC (rev 114607)
@@ -0,0 +1,60 @@
+
+
+
+ jboss:service=JNDIView
+
+
+ queryNames
+
+ JBossAdmin
+ Tester
+
+
+
+ list
+
+ Tester
+ JBossAdmin
+
+
+
+
+
+ jboss:service=invoker,*
+
+
+ setRMIObjectPort
+
+ JBossAdmin
+
+
+
+ get.*
+
+ JBossAdmin
+ Tester
+ Babe
+
+
+
+
+
+ jboss:*
+
+
+
+ .*
+
+ Tester
+
+
+
+ get.*
+
+ JBossAdmin
+ Babe
+
+
+
+
+
\ No newline at end of file
From jboss-cvs-commits at lists.jboss.org Wed Dec 18 11:40:50 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Wed, 18 Dec 2013 11:40:50 -0500
Subject: [jboss-cvs] JBossAS SVN: r114608 -
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/crypto.
Message-ID: <201312181640.rBIGeoXO018435@svn01.web.mwc.hst.phx2.redhat.com>
Author: ehugonnet
Date: 2013-12-18 11:40:50 -0500 (Wed, 18 Dec 2013)
New Revision: 114608
Modified:
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/crypto/CryptoUtil.java
Log:
JBPAPP-10556: CryptoUtil.hasUnlimitedCrypto() returns true even if the unlimited JCE cryptography is not installed
Backport from EAP 6
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/crypto/CryptoUtil.java
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/crypto/CryptoUtil.java 2013-12-18 08:20:34 UTC (rev 114607)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/crypto/CryptoUtil.java 2013-12-18 16:40:50 UTC (rev 114608)
@@ -24,7 +24,6 @@
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
import java.math.BigInteger;
import java.security.GeneralSecurityException;
import java.security.KeyException;
@@ -35,7 +34,6 @@
import java.security.Security;
import java.util.Random;
-import javax.crypto.KeyGenerator;
import javax.crypto.spec.SecretKeySpec;
import org.jboss.crypto.digest.DigestCallback;
@@ -476,17 +474,7 @@
boolean hasUnlimitedCrypto = false;
try
{
- Class keyGenClass = KeyGenerator.class;
- Class[] sig = {String.class};
- Object[] args = {"Blowfish"};
- Method kgenInstance = keyGenClass.getDeclaredMethod("getInstance", sig);
- Object kgen = kgenInstance.invoke(null, args);
-
- Class[] sig2 = {int.class};
- Object[] args2 = {Integer.valueOf(256)};
- Method init = keyGenClass.getDeclaredMethod("init", sig2);
- init.invoke(kgen, args2);
- hasUnlimitedCrypto = true;
+ hasUnlimitedCrypto = javax.crypto.Cipher.getMaxAllowedKeyLength("Blowfish") > 128;
}
catch(Throwable e)
{
From jboss-cvs-commits at lists.jboss.org Wed Dec 18 11:50:51 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Wed, 18 Dec 2013 11:50:51 -0500
Subject: [jboss-cvs] JBossAS SVN: r114609 -
branches/JBPAPP_5/component-matrix.
Message-ID: <201312181650.rBIGopJn018629@svn01.web.mwc.hst.phx2.redhat.com>
Author: huwang
Date: 2013-12-18 11:50:51 -0500 (Wed, 18 Dec 2013)
New Revision: 114609
Modified:
branches/JBPAPP_5/component-matrix/pom.xml
Log:
JBPAPP-10220 Upgrade JBoss CL to 2.0.12.GA, JBPAPP-10744 upgrade jboss serialization to 1_0_6, JBPAPP-10645 Upgrade JBoss VFS to 2.2.3.GA, JBPAPP-10719 Upgrade Picketbox Negotiation to 2.1.4 and JBPAPP-10360 Upgrade jboss-server-manager to 1.0.2.GA_CP02
Modified: branches/JBPAPP_5/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5/component-matrix/pom.xml 2013-12-18 16:40:50 UTC (rev 114608)
+++ branches/JBPAPP_5/component-matrix/pom.xml 2013-12-18 16:50:51 UTC (rev 114609)
@@ -64,7 +64,7 @@
1.0.0.GA
3.2.11.GA
3.0.1.GA
- 2.0.11.GA
+ 2.0.12.GA
2.0.3.Final
2.0.0.GA
1.1.4.Final
@@ -88,9 +88,11 @@
2.5.4.SP4_patch01
2.0.5.SP3-1-patch-01
2.0.5.SP3-1
- 2.1.3.GA
+ 2.1.4.GA
+ 1.0.6.FINAL
+ 1.0.2.GA_CP02
1.0.0.GA
- 2.2.1.GA
+ 2.2.3.GA
1.0.1.GA
1.2.1.GA
1.5.8-patch-01
@@ -631,7 +633,7 @@
jboss
jboss-serialization
- 1.0.5.FINAL
+ ${version.org.jboss.serialization}
jboss
@@ -1509,7 +1511,7 @@
org.jboss.jbossas
jboss-server-manager
- 1.0.2.GA
+ ${version.org.jboss.server.manager}
org.jboss.jbossas
From jboss-cvs-commits at lists.jboss.org Thu Dec 19 01:42:09 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Thu, 19 Dec 2013 01:42:09 -0500
Subject: [jboss-cvs] JBossAS SVN: r114610 - in branches/JBPAPP_5:
testsuite/src/main/org/jboss/test/security/test and 1 other
directory.
Message-ID: <201312190642.rBJ6g9rO006311@svn01.web.mwc.hst.phx2.redhat.com>
Author: istudens at redhat.com
Date: 2013-12-19 01:42:08 -0500 (Thu, 19 Dec 2013)
New Revision: 114610
Added:
branches/JBPAPP_5/security/src/main/org/jboss/security/plugins/JaasSecurityDomainUtil.java
Modified:
branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/test/JaasSecurityDomainUnitTestCase.java
Log:
JBPAPP-10913 Provide a helper class for JAAS Security Domain encrypt/decrypt functions
Added: branches/JBPAPP_5/security/src/main/org/jboss/security/plugins/JaasSecurityDomainUtil.java
===================================================================
--- branches/JBPAPP_5/security/src/main/org/jboss/security/plugins/JaasSecurityDomainUtil.java (rev 0)
+++ branches/JBPAPP_5/security/src/main/org/jboss/security/plugins/JaasSecurityDomainUtil.java 2013-12-19 06:42:08 UTC (rev 114610)
@@ -0,0 +1,127 @@
+package org.jboss.security.plugins;
+
+import org.jboss.mx.util.MBeanServerLocator;
+
+import javax.management.MBeanServer;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+/**
+ * A helper encryting/decrypting application level API based on JAAS Security Domain.
+ *
+ * @author Ivo Studensky
+ */
+public class JaasSecurityDomainUtil {
+
+ /** Encode a secret using the securityDomain.
+ * @param securityDomain the security domain mbean name
+ * @param secret - the byte sequence to encrypt
+ * @return the encrypted byte sequence
+ * @throws Exception
+ */
+ public static byte[] encode(String securityDomain, byte[] secret) throws Exception
+ {
+ return (byte[]) invoke(securityDomain, "encode", new Object[]{secret}, new String[]{byte[].class.getName()});
+ }
+
+ /** Encode a secret using the securityDomain.
+ * @param server jboss mbean server
+ * @param securityDomain the security domain mbean name
+ * @param secret - the byte sequence to encrypt
+ * @return the encrypted byte sequence
+ * @throws Exception
+ */
+ public static byte[] encode(MBeanServerConnection server, String securityDomain, byte[] secret) throws Exception
+ {
+ return (byte[]) invoke(server, securityDomain, "encode", new Object[]{secret}, new String[]{byte[].class.getName()});
+ }
+
+ /** Decode a secret using the securityDomain.
+ * @param securityDomain the security domain mbean name
+ * @param secret - the byte sequence to decrypt
+ * @return the decrypted byte sequence
+ * @throws Exception
+ */
+ public static byte[] decode(String securityDomain, byte[] secret) throws Exception
+ {
+ return (byte[]) invoke(securityDomain, "decode", new Object[]{secret}, new String[]{byte[].class.getName()});
+ }
+
+ /** Decode a secret using the securityDomain.
+ * @param server jboss mbean server
+ * @param securityDomain the security domain mbean name
+ * @param secret - the byte sequence to decrypt
+ * @return the decrypted byte sequence
+ * @throws Exception
+ */
+ public static byte[] decode(MBeanServerConnection server, String securityDomain, byte[] secret) throws Exception
+ {
+ return (byte[]) invoke(server, securityDomain, "decode", new Object[]{secret}, new String[]{byte[].class.getName()});
+ }
+
+ /** Encode a secret using the securityDomain.
+ * @param securityDomain the security domain mbean name
+ * @param secret - the byte sequence to encrypt as a base64 string using
+ * the Util.tob64() function
+ * @return the encrypted byte sequence
+ * @throws Exception
+ */
+ public static String encode64(String securityDomain, byte[] secret) throws Exception
+ {
+ return (String) invoke(securityDomain, "encode64", new Object[]{secret}, new String[]{byte[].class.getName()});
+ }
+
+ /** Encode a secret using the securityDomain.
+ * @param server jboss mbean server
+ * @param securityDomain the security domain mbean name
+ * @param secret - the byte sequence to encrypt as a base64 string using
+ * the Util.tob64() function
+ * @return the encrypted byte sequence
+ * @throws Exception
+ */
+ public static String encode64(MBeanServerConnection server, String securityDomain, byte[] secret) throws Exception
+ {
+ return (String) invoke(server, securityDomain, "encode64", new Object[]{secret}, new String[]{byte[].class.getName()});
+ }
+
+ /** Decode a secret using the securityDomain.
+ * @param securityDomain the security domain mbean name
+ * @param secret - the Util.tob64 string represention to decrypt
+ * @return the decrypted byte sequence
+ * @throws Exception
+ */
+ public static byte[] decode64(String securityDomain, String secret) throws Exception
+ {
+ return (byte[]) invoke(securityDomain, "decode64", new Object[] {secret}, new String[] {String.class.getName()});
+ }
+
+ /** Decode a secret using the securityDomain.
+ * @param server jboss mbean server
+ * @param securityDomain the security domain mbean name
+ * @param secret - the Util.tob64 string represention to decrypt
+ * @return the decrypted byte sequence
+ * @throws Exception
+ */
+ public static byte[] decode64(MBeanServerConnection server, String securityDomain, String secret) throws Exception
+ {
+ return (byte[]) invoke(server, securityDomain, "decode64", new Object[] {secret}, new String[] {String.class.getName()});
+ }
+
+ /*
+ * Invokes a method methodName on a securityDomain with its params.
+ */
+ private static Object invoke(String securityDomain, String methodName, Object[] params, String[] signature) throws Exception
+ {
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ return invoke(server, securityDomain, methodName, params, signature);
+ }
+
+ /*
+ * Invokes a method methodName on a securityDomain with its params.
+ */
+ private static Object invoke(MBeanServerConnection server, String securityDomain, String methodName, Object[] params, String[] signature) throws Exception
+ {
+ return server.invoke(new ObjectName(securityDomain), methodName, params, signature);
+ }
+
+}
Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/test/JaasSecurityDomainUnitTestCase.java
===================================================================
--- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/test/JaasSecurityDomainUnitTestCase.java 2013-12-18 16:50:51 UTC (rev 114609)
+++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/test/JaasSecurityDomainUnitTestCase.java 2013-12-19 06:42:08 UTC (rev 114610)
@@ -31,6 +31,7 @@
import javax.crypto.SecretKey;
import javax.crypto.Cipher;
+import org.jboss.security.plugins.JaasSecurityDomainUtil;
import org.jboss.test.JBossTestCase;
import org.jboss.test.JBossTestSetup;
import org.jboss.security.plugins.FilePassword;
@@ -133,6 +134,25 @@
assertTrue("secret == decode2", Arrays.equals(secret, decode2));
}
+ public void testEncodeDecodeWithUtil() throws Exception
+ {
+ String securityDomain = "jboss.security:service=JaasSecurityDomain,domain=encode-decode";
+ byte[] secret = "secret".getBytes();
+ byte[] encode = JaasSecurityDomainUtil.encode(getServer(), securityDomain, secret);
+ assertTrue("secret != encode", Arrays.equals(secret, encode) == false);
+ byte[] decode = JaasSecurityDomainUtil.decode(getServer(), securityDomain, encode);
+ assertTrue("secret == decode", Arrays.equals(secret, decode));
+
+ // repeat the test, this time invoking the sec domain that was configured as a microcontainer bean.
+ String exportedSecurityDomain = "jboss.security:service=JaasSecurityDomain,domain=encode-decode2";
+ // invoke the encode operation using the bean's exported MBean interface.
+ byte[] encode2 = JaasSecurityDomainUtil.encode(getServer(), exportedSecurityDomain, secret);
+ assertTrue("secret != encode2", Arrays.equals(secret, encode2) == false);
+ // invoke the decode operation using the bean's exported MBean interface.
+ byte[] decode2 = JaasSecurityDomainUtil.decode(getServer(), exportedSecurityDomain, encode2);
+ assertTrue("secret == decode2", Arrays.equals(secret, decode2));
+ }
+
public void testEncodeDecode64() throws Exception
{
ObjectName name = new ObjectName("jboss.security:service=JaasSecurityDomain,domain=encode-decode");
@@ -156,6 +176,23 @@
assertTrue("secret == decode2", Arrays.equals(secret, decode2));
}
+ public void testEncodeDecode64WithUtil() throws Exception
+ {
+ String securityDomain = "jboss.security:service=JaasSecurityDomain,domain=encode-decode";
+ byte[] secret = "secret".getBytes();
+ String encode = JaasSecurityDomainUtil.encode64(getServer(), securityDomain, secret);
+ byte[] decode = JaasSecurityDomainUtil.decode64(getServer(), securityDomain, encode);
+ assertTrue("secret == decode", Arrays.equals(secret, decode));
+
+ // repeat the test, this time invoking the sec domain that was configured as a microcontainer bean.
+ String exportedSecurityDomain = "jboss.security:service=JaasSecurityDomain,domain=encode-decode2";
+ // invoke the encode64 operation using the bean's exported MBean interface.
+ String encode2 = JaasSecurityDomainUtil.encode64(getServer(), exportedSecurityDomain, secret);
+ // invoke the decode64 operation using the bean's exported MBean interface.
+ byte[] decode2 = JaasSecurityDomainUtil.decode64(getServer(), exportedSecurityDomain, encode2);
+ assertTrue("secret == decode2", Arrays.equals(secret, decode2));
+ }
+
/**
* Setup the test suite.
*/
From jboss-cvs-commits at lists.jboss.org Thu Dec 19 02:19:42 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Thu, 19 Dec 2013 02:19:42 -0500
Subject: [jboss-cvs] JBossAS SVN: r114611 - in branches/JBPAPP_5:
testsuite/src/main/org/jboss/test/scripts/test and 1 other
directory.
Message-ID: <201312190719.rBJ7JgEq013558@svn01.web.mwc.hst.phx2.redhat.com>
Author: istudens at redhat.com
Date: 2013-12-19 02:19:42 -0500 (Thu, 19 Dec 2013)
New Revision: 114611
Modified:
branches/JBPAPP_5/server/src/main/org/jboss/Shutdown.java
branches/JBPAPP_5/testsuite/src/main/org/jboss/test/scripts/test/ShutdownTestCase.java
Log:
JBPAPP-10912 Provide credentials via a property file for the shutdown script
Modified: branches/JBPAPP_5/server/src/main/org/jboss/Shutdown.java
===================================================================
--- branches/JBPAPP_5/server/src/main/org/jboss/Shutdown.java 2013-12-19 06:42:08 UTC (rev 114610)
+++ branches/JBPAPP_5/server/src/main/org/jboss/Shutdown.java 2013-12-19 07:19:42 UTC (rev 114611)
@@ -21,6 +21,8 @@
*/
package org.jboss;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
@@ -34,7 +36,6 @@
import javax.naming.Context;
import javax.naming.InitialContext;
-
import gnu.getopt.Getopt;
import gnu.getopt.LongOpt;
@@ -46,6 +47,8 @@
import org.jboss.mx.util.ObjectNameFactory;
import java.io.Console;
+import java.util.Properties;
+
/**
* A JMX client that uses an MBeanServerConnection to shutdown a remote JBoss
* server.
@@ -69,19 +72,23 @@
System.out.println("usage: " + PROGRAM_NAME + " [options] ");
System.out.println();
System.out.println("options:");
- System.out.println(" -h, --help Show this help message (default)");
- System.out.println(" -D[=] Set a system property");
- System.out.println(" -- Stop processing options");
- System.out.println(" -s, --server= Specify the JNDI URL of the remote server");
- System.out.println(" -n, --serverName= Specify the JMX name of the ServerImpl");
- System.out.println(" -a, --adapter= Specify JNDI name of the MBeanServerConnection to use");
- System.out.println(" -u, --user= Specify the username for authentication");
- System.out.println(" -p, --password= Specify the password for authentication");
+ System.out.println(" -h, --help Show this help message (default)");
+ System.out.println(" -D[=] Set a system property");
+ System.out.println(" -- Stop processing options");
+ System.out.println(" -s, --server= Specify the JNDI URL of the remote server");
+ System.out.println(" -n, --serverName= Specify the JMX name of the ServerImpl");
+ System.out.println(" -a, --adapter= Specify JNDI name of the MBeanServerConnection to use");
+ System.out.println(" -u, --user= Specify the username for authentication");
+ System.out.println(" -p, --password= Specify the password for authentication");
+ System.out.println(" -P, --properties= Load options from a property file");
+ System.out.println(" Command line options override duplicates from the file");
+ System.out.println(" Options: shutdown.user, shutdown.password,");
+ System.out.println(" shutdown.server, shutdown.serverName, shutdown.adapter");
System.out.println();
System.out.println("operations:");
- System.out.println(" -S, --shutdown Shutdown the server");
- System.out.println(" -e, --exit= Force the VM to exit with a status code");
- System.out.println(" -H, --halt= Force the VM to halt with a status code");
+ System.out.println(" -S, --shutdown Shutdown the server");
+ System.out.println(" -e, --exit= Force the VM to exit with a status code");
+ System.out.println(" -H, --halt= Force the VM to halt with a status code");
System.out.println();
}
@@ -93,7 +100,7 @@
System.exit(0);
}
- String sopts = "-:hD:s:n:a:u:p:Se:H:";
+ String sopts = "-:hD:s:n:a:u:p:P:Se:H:";
LongOpt[] lopts =
{
new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'),
@@ -105,6 +112,7 @@
new LongOpt("halt", LongOpt.REQUIRED_ARGUMENT, null, 'H'),
new LongOpt("user", LongOpt.REQUIRED_ARGUMENT, null, 'u'),
new LongOpt("password", LongOpt.REQUIRED_ARGUMENT, null, 'p'),
+ new LongOpt("properties", LongOpt.REQUIRED_ARGUMENT, null, 'P'),
};
Getopt getopt = new Getopt(PROGRAM_NAME, args, sopts, lopts);
@@ -113,12 +121,15 @@
String serverURL = null;
String adapterName = "jmx/rmi/RMIAdaptor";
+ String clAdapterName = null;
String username = null;
String password = null;
ObjectName serverJMXName = ObjectNameFactory.create("jboss.system:type=JVMShutdown");
+ String clServerJMXName = null;
boolean exit = false;
boolean halt = false;
int exitcode = -1;
+ String propertyFile = null;
while ((code = getopt.getopt()) != -1)
{
@@ -163,22 +174,23 @@
serverURL = getopt.getOptarg();
break;
case 'n':
- serverJMXName = new ObjectName(getopt.getOptarg());
+ clServerJMXName = getopt.getOptarg();
break;
case 'S':
// nothing...
break;
case 'a':
- adapterName = getopt.getOptarg();
+ clAdapterName = getopt.getOptarg();
break;
case 'u':
username = getopt.getOptarg();
- SecurityAssociation.setPrincipal(new SimplePrincipal(username));
break;
case 'p':
password = getopt.getOptarg();
- SecurityAssociation.setCredential(password);
break;
+ case 'P':
+ propertyFile = getopt.getOptarg();
+ break;
case 'e':
exitcode = Integer.parseInt(getopt.getOptarg());
exit = true;
@@ -189,7 +201,35 @@
break;
}
}
-
+
+ // cmd line options override the property file entries
+ if( propertyFile != null )
+ {
+ Properties props = loadPropertyFile(propertyFile);
+ if( props != null )
+ {
+ if( username == null && props.containsKey("shutdown.user") )
+ username = props.getProperty("shutdown.user");
+ if( password == null && props.containsKey("shutdown.password") )
+ password = props.getProperty("shutdown.password");
+ if( serverURL == null && props.containsKey("shutdown.server") )
+ serverURL = props.getProperty("shutdown.server");
+ if( clServerJMXName != null )
+ serverJMXName = new ObjectName(clServerJMXName);
+ else if( props.containsKey("shutdown.serverName") )
+ serverJMXName = new ObjectName(props.getProperty("shutdown.serverName"));
+ if( clAdapterName != null )
+ adapterName = clAdapterName;
+ else if( props.containsKey("shutdown.adapter") )
+ adapterName = props.getProperty("shutdown.adapter");
+ }
+ }
+
+ if( username != null )
+ SecurityAssociation.setPrincipal(new SimplePrincipal(username));
+ if( password != null )
+ SecurityAssociation.setCredential(password);
+
InitialContext ctx;
// If there was a username specified, but no password prompt for it
@@ -251,6 +291,27 @@
System.out.println("Server shutdown may take a while - check logfiles for completion");
}
+ /*
+ * Options on the command line take precedence.
+ */
+ private static Properties loadPropertyFile(final String propertyFile) throws IOException
+ {
+ Properties fileProps = new Properties();
+ FileInputStream in = null;
+ try
+ {
+ in = new FileInputStream(propertyFile);
+ fileProps.load(in);
+ return fileProps;
+ }
+ finally
+ {
+ if( in != null )
+ try { in.close(); } catch (Exception e) {}
+ }
+ }
+
+
private static class ServerProxyHandler implements InvocationHandler
{
ObjectName serverName;
Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/scripts/test/ShutdownTestCase.java
===================================================================
--- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/scripts/test/ShutdownTestCase.java 2013-12-19 06:42:08 UTC (rev 114610)
+++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/scripts/test/ShutdownTestCase.java 2013-12-19 07:19:42 UTC (rev 114611)
@@ -23,7 +23,9 @@
package org.jboss.test.scripts.test;
import java.io.File ;
+import java.io.FileWriter;
import java.io.IOException ;
+import java.util.Properties;
import javax.management.ObjectName ;
import javax.management.MalformedObjectNameException ;
@@ -163,6 +165,63 @@
}
}
+ /**
+ * Tests shutdown command with -S option
+ *
+ * @throws Exception
+ */
+ public void testPropertiesNonLoopbackShutdown() throws Exception
+ {
+ // build the shell command to execute
+ // supply the command name prefix, any options as a string, and any args
+ String[] shellCommand = getShellCommand("run","-c " + getServerConfig() + " -b " + getServerHost(), null) ;
+ String[] envp = null ;
+ File workingDir = new File(getBinDir()) ;
+
+ // execute command
+ getAsyncShellScriptExecutor().startShellCommand(shellCommand, envp, workingDir) ;
+
+ // waitForServerStart kills the process and throws an exception if server does not start
+ try {
+ waitForServerStart(getAsyncShellScriptExecutor(), getServerHost(), START_TIMEOUT) ;
+ System.out.println("Server started successfully") ;
+ }
+ catch(IOException e) {
+ System.out.println("IOException: message = " + e.getMessage()) ;
+ writeServerLogsToTestCase() ;
+ fail("Server failed to start") ;
+ }
+
+ // check assertions on the console output generated by the run command
+ getAsyncShellScriptExecutor().assertOnOutputStream("Started in","Started string not found in command output") ;
+
+ File propFile = new File("shutdown.properties");
+
+ // set properties
+ Properties props = new Properties();
+ props.setProperty("shutdown.server", getJndiURL());
+ props.store(new FileWriter(propFile), null);
+
+ // shutdown the server using the shutdown command
+ String[] shutdownCommand = getShellCommand("shutdown", "-P " + propFile.getCanonicalPath() + " -S", null) ;
+ getShellScriptExecutor().runShellCommand(shutdownCommand, envp, workingDir) ;
+
+ System.out.println("shutdown output = " + getShellScriptExecutor().getOutput()) ;
+ System.out.println("shutdown error = " + getShellScriptExecutor().getError()) ;
+
+ // waitForServerStop kills the process and throws an exception if server does not stop
+ try {
+ waitForServerStop(getAsyncShellScriptExecutor(), STOP_TIMEOUT) ;
+ System.out.println("Server stopped successfully") ;
+ getAsyncShellScriptExecutor().assertOnOutputStream(SERVER_STOPPED_MESSAGE,"Server shutdown message did not appear in logs") ;
+ }
+ catch(IOException e) {
+ System.out.println("IOException: message = " + e.getMessage()) ;
+ writeServerLogsToTestCase() ;
+ fail("Server failed to stop") ;
+ }
+ }
+
/* for the two following tests, see JBPAPP-3035 */
/**
From jboss-cvs-commits at lists.jboss.org Thu Dec 19 06:41:15 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Thu, 19 Dec 2013 06:41:15 -0500
Subject: [jboss-cvs] JBossAS SVN: r114612 -
branches/JBPAPP_5/component-matrix.
Message-ID: <201312191141.rBJBfFfS016115@svn01.web.mwc.hst.phx2.redhat.com>
Author: wolfc
Date: 2013-12-19 06:41:15 -0500 (Thu, 19 Dec 2013)
New Revision: 114612
Modified:
branches/JBPAPP_5/component-matrix/pom.xml
Log:
JBPAPP-10360: revert upgrade of jboss-server-manager to 1.0.2.GA because of regression
Modified: branches/JBPAPP_5/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5/component-matrix/pom.xml 2013-12-19 07:19:42 UTC (rev 114611)
+++ branches/JBPAPP_5/component-matrix/pom.xml 2013-12-19 11:41:15 UTC (rev 114612)
@@ -90,7 +90,7 @@
2.0.5.SP3-1
2.1.4.GA
1.0.6.FINAL
- 1.0.2.GA_CP02
+ 1.0.2.GA
1.0.0.GA
2.2.3.GA
1.0.1.GA
From jboss-cvs-commits at lists.jboss.org Thu Dec 19 07:38:58 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Thu, 19 Dec 2013 07:38:58 -0500
Subject: [jboss-cvs] JBossAS SVN: r114613 - in
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src:
main/java/org/jboss/security/auth/spi and 5 other directories.
Message-ID: <201312191238.rBJCcwUJ024392@svn01.web.mwc.hst.phx2.redhat.com>
Author: pskopek
Date: 2013-12-19 07:38:58 -0500 (Thu, 19 Dec 2013)
New Revision: 114613
Modified:
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/Util.java
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/mapping/providers/attribute/LdapAttributeMappingProvider.java
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/vault/PicketBoxSecurityVault.java
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/test/java/org/jboss/test/security/helpers/SecurityUtilUnitTestCase.java
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/test/java/org/jboss/test/security/vault/SecurityVaultUnitTestCase.java
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/test/resources/bin/askpass.sh
Log:
[SECURITY-774] Enable white-space in parameters for external password command
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/Util.java
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/Util.java 2013-12-19 11:41:15 UTC (rev 114612)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/Util.java 2013-12-19 12:38:58 UTC (rev 114613)
@@ -37,7 +37,7 @@
/**
* Util.
- *
+ *
* @author Scott.Stark at jboss.org
* @author Adrian Brock
* @version $Revision: 1.1 $
@@ -46,7 +46,7 @@
{
private static Logger log = Logger.getLogger(Util.class);
private static PasswordCache externalPasswordCache;
-
+
/**
* Execute a password load command to obtain the char[] contents of a
* password.
@@ -58,7 +58,11 @@
* platform command. The first line of the command output is used as the
* password.
* EXTC variant will cache the passwords for expiration_in_millis milliseconds.
- * Default cache expiration is 0 = infinity.
+ * Default cache expiration is 0 = infinity.
+ * '{CMD}...' or '{CMDC}...' for a general command to execute. The general
+ * command is a string delimited by ',' where the first part is the actual
+ * command and further parts represents its parameters. The comma can be
+ * backslashed in order to keep it as a part of the parameter.
* '{CLASS}classname[:ctorargs]' where the '[:ctorargs]' is an optional
* string delimited by the ':' from the classname that will be passed to the
* classname ctor. The ctorargs itself is a comma delimited list of strings.
@@ -90,7 +94,7 @@
if( password == null )
{
// Load the password
- if (passwordCmdType.startsWith("EXTC")) {
+ if (passwordCmdType.startsWith("EXTC") || passwordCmdType.startsWith("CMDC")) {
long timeOut = 0;
if (passwordCmdType.indexOf(':') > -1) {
try {
@@ -108,14 +112,14 @@
if (externalPasswordCache.contains(passwordCmd, timeOut)) {
password = externalPasswordCache.getPassword(passwordCmd);
} else {
- password = execPasswordCmd(passwordCmd);
+ password = switchCommandExecution(passwordCmdType, passwordCmd);
if (password != null) {
externalPasswordCache.storePassword(passwordCmd, password);
}
}
- } else if (passwordCmdType.startsWith("EXT")) {
- // non-cached EXT variant
- password = execPasswordCmd(passwordCmd);
+ } else if (passwordCmdType.startsWith("EXT") || passwordCmdType.startsWith("CMD")) {
+ // non-cached variant
+ password = switchCommandExecution(passwordCmdType, passwordCmd);
} else if (passwordCmdType.equals("CLASS")) {
password = invokePasswordClass(passwordCmd);
} else {
@@ -125,6 +129,17 @@
return password;
}
+ private static char[] switchCommandExecution(String passwordCmdType, String passwordCmd)
+ throws Exception
+ {
+ if (passwordCmdType.startsWith("EXT"))
+ return execPasswordCmd(passwordCmd);
+ else if (passwordCmdType.startsWith("CMD"))
+ return execPBBasedPasswordCommand(passwordCmd);
+ else
+ throw new IllegalArgumentException("Invalid password command type: " + passwordCmdType);
+ }
+
/**
* Execute a Runtime command to load a password.
* @param passwordCmd
@@ -132,7 +147,7 @@
* @throws Exception
*/
private static char[] execPasswordCmd(String passwordCmd)
- throws Exception
+ throws Exception
{
log.debug("Executing command: "+passwordCmd);
String password = execCmd(passwordCmd);
@@ -140,7 +155,7 @@
}
private static char[] invokePasswordClass(String passwordCmd)
- throws Exception
+ throws Exception
{
char[] password = null;
@@ -219,24 +234,47 @@
return line;
}
-
+ /**
+ * Execute a Runtime command to load a password.
+ * It uses ProcessBuilder to execute the command.
+ * @param passwordCmd
+ * @return the loaded password
+ * @throws Exception
+ */
+ private static char[] execPBBasedPasswordCommand(String passwordCmd) throws Exception
+ {
+ log.debug("Executing command: "+passwordCmd);
+ SecurityManager sm = System.getSecurityManager();
+ String password;
+ if( sm != null )
+ {
+ password = RuntimeActions.PB_BASED_PRIVILEGED.execCmd(passwordCmd);
+ }
+ else
+ {
+ password = RuntimeActions.PB_BASED_NON_PRIVILEGED.execCmd(passwordCmd);
+ }
+ return password.toCharArray();
+ }
+
+
interface RuntimeActions
{
RuntimeActions PRIVILEGED = new RuntimeActions()
{
public String execCmd(final String cmd)
- throws Exception
+ throws Exception
{
try
{
String line = AccessController.doPrivileged(
- new PrivilegedExceptionAction()
- {
- public String run() throws Exception
+ new PrivilegedExceptionAction()
{
- return NON_PRIVILEGED.execCmd(cmd);
+ public String run() throws Exception
+ {
+ return NON_PRIVILEGED.execCmd(cmd);
+ }
}
- }
);
return line;
}
@@ -249,7 +287,7 @@
RuntimeActions NON_PRIVILEGED = new RuntimeActions()
{
public String execCmd(final String cmd)
- throws Exception
+ throws Exception
{
Runtime rt = Runtime.getRuntime();
Process p = rt.exec(cmd);
@@ -275,6 +313,93 @@
return line;
}
};
+ RuntimeActions PB_BASED_PRIVILEGED = new RuntimeActions()
+ {
+ public String execCmd(final String command)
+ throws Exception
+ {
+ try
+ {
+ String password = AccessController.doPrivileged(
+ new PrivilegedExceptionAction()
+ {
+ public String run() throws Exception
+ {
+ return PB_BASED_NON_PRIVILEGED.execCmd(command);
+ }
+ }
+ );
+ return password;
+ }
+ catch(PrivilegedActionException e)
+ {
+ throw e.getException();
+ }
+ }
+ };
+ RuntimeActions PB_BASED_NON_PRIVILEGED = new RuntimeActions()
+ {
+ public String execCmd(final String command) throws Exception
+ {
+ final String[] parsedCommand = parseCommand(command);
+ final ProcessBuilder builder = new ProcessBuilder(parsedCommand);
+ final Process process = builder.start();
+ final String line;
+ BufferedReader reader = null;
+ try
+ {
+ reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+ line = reader.readLine();
+ }
+ finally
+ {
+ if (reader != null)
+ reader.close();
+ }
+
+ int exitCode = process.waitFor();
+ log.debug("Command exited with: "+exitCode);
+ return line;
+ }
+
+ protected String[] parseCommand(String command)
+ {
+ // comma can be backslashed
+ final String[] parsedCommand = command.split("(? options = getVaultOptionsMap(
"target/vaults/vault2/vault.jks",
"target/vaults/vault2/vault_data",
- "vault", "12438567", 50, "{EXT}/bin/sh " + absolutePathToAskPass + " Enter passphrase for askpass test");
+ "vault", "12438567", 50, "{CMD}/bin/sh," + absolutePathToAskPass + ",Enter passphrase for askpass test");
String vaultBlock = "aBlock";
String attributeName = "anAttribute";
@@ -437,8 +438,7 @@
private String getMaskedPassword(String pwd, String salt, int iterationCount) throws Exception
{
- if (pwd.startsWith(PicketBoxSecurityVault.PASS_EXT_PREFIX)
- || pwd.startsWith(PicketBoxSecurityVault.PASS_CLASS_PREFIX))
+ if (Util.isPasswordCommand(pwd))
return pwd;
String algo = "PBEwithMD5andDES";
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/test/resources/bin/askpass.sh
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/test/resources/bin/askpass.sh 2013-12-19 11:41:15 UTC (rev 114612)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/test/resources/bin/askpass.sh 2013-12-19 12:38:58 UTC (rev 114613)
@@ -1,2 +1,7 @@
#!/bin/sh
-echo vault22
\ No newline at end of file
+
+if [ "$1" = "Enter passphrase for askpass test" ]; then
+ echo vault22
+else
+ echo $1
+fi
From jboss-cvs-commits at lists.jboss.org Thu Dec 19 10:22:15 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Thu, 19 Dec 2013 10:22:15 -0500
Subject: [jboss-cvs] JBossAS SVN: r114614 -
projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager.
Message-ID: <201312191522.rBJFMF1m016313@svn01.web.mwc.hst.phx2.redhat.com>
Author: istudens at redhat.com
Date: 2013-12-19 10:22:15 -0500 (Thu, 19 Dec 2013)
New Revision: 114614
Modified:
projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/Server.java
projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/ServerController.java
Log:
JBPAPP-10661 fixing the regression caused by an empty jvmArg
Modified: projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/Server.java
===================================================================
--- projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/Server.java 2013-12-19 12:38:58 UTC (rev 114613)
+++ projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/Server.java 2013-12-19 15:22:15 UTC (rev 114614)
@@ -239,7 +239,8 @@
*/
public void addArg(Argument arg)
{
- arguments.add(arg);
+ if (arg.getValue() != null && arg.getValue().isEmpty() == false)
+ arguments.add(arg);
}
/**
@@ -280,7 +281,8 @@
*/
public void addJvmArg(Argument arg)
{
- jvmArguments.add(arg);
+ if (arg.getValue() != null && arg.getValue().isEmpty() == false)
+ jvmArguments.add(arg);
}
/**
Modified: projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/ServerController.java
===================================================================
--- projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/ServerController.java 2013-12-19 12:38:58 UTC (rev 114613)
+++ projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/ServerController.java 2013-12-19 15:22:15 UTC (rev 114614)
@@ -84,7 +84,7 @@
final ProcessBuilder startCommand = getStartCommand(server, manager);
- System.out.println("Starting server \"" + server.getName() + "\", with command (start timeout is " + manager.getStartupTimeout() + " seconds ): \n" + Arrays.toString(startCommand.command().toArray()));
+ System.out.println("Starting server \"" + server.getName() + "\", with command (start timeout is " + manager.getStartupTimeout() + " seconds ): \n" + commandToString(startCommand.command()));
final File binDir = new File(manager.getJBossHome(), "/bin");
startCommand.directory(binDir);
@@ -134,6 +134,17 @@
System.out.println("Server started.") ;
}
+ private static String commandToString(List command)
+ {
+ final StringBuilder commandLine = new StringBuilder();
+ String delim = "";
+ for (String part : command) {
+ commandLine.append(delim).append(part);
+ delim = " ";
+ }
+ return commandLine.toString();
+ }
+
/**
* Delete & create log files
* @param logFile
@@ -235,7 +246,7 @@
private static boolean stopServerCli(Server server, ServerManager manager, Writer log) throws IOException, InterruptedException
{
ProcessBuilder shutdownCmd = getStopCommand(server, manager);
- System.out.println("Shutting down server: " + Arrays.toString(shutdownCmd.command().toArray()));
+ System.out.println("Shutting down server: " + commandToString(shutdownCmd.command()));
shutdownCmd.redirectErrorStream(true);
Process proc = shutdownCmd.start();
From jboss-cvs-commits at lists.jboss.org Thu Dec 19 13:15:56 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Thu, 19 Dec 2013 13:15:56 -0500
Subject: [jboss-cvs] JBossAS SVN: r114615 -
branches/JBPAPP_5/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent.
Message-ID: <201312191815.rBJIFuwB008939@svn01.web.mwc.hst.phx2.redhat.com>
Author: dereed
Date: 2013-12-19 13:15:56 -0500 (Thu, 19 Dec 2013)
New Revision: 114615
Modified:
branches/JBPAPP_5/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/AbstractPersistentManager.java
branches/JBPAPP_5/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/RDBMSStoreBase.java
Log:
[JBPAPP-10206] Workaround for session persistence to an Oracle DB for the root context
Modified: branches/JBPAPP_5/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/AbstractPersistentManager.java
===================================================================
--- branches/JBPAPP_5/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/AbstractPersistentManager.java 2013-12-19 15:22:15 UTC (rev 114614)
+++ branches/JBPAPP_5/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/AbstractPersistentManager.java 2013-12-19 18:15:56 UTC (rev 114615)
@@ -43,6 +43,11 @@
private final P store;
/**
+ * Substitute app name for root context with "/" to work around Oracle DB bug (JBPAPP-10206)
+ */
+ private Boolean substituteRootContext = null;
+
+ /**
* The connection username to use when trying to connect to the database.
*/
private String connectionName = null;
@@ -152,6 +157,19 @@
}
+
+ public Boolean getSubstituteRootContext()
+ {
+ return substituteRootContext;
+ }
+
+
+ public void setSubstituteRootContext(Boolean substituteRootContext)
+ {
+ this.substituteRootContext = substituteRootContext;
+ }
+
+
public String getConnectionName()
{
return connectionName;
@@ -400,6 +418,10 @@
store.setName(this.getContextName());
store.setMaxUnreplicatedInterval(getMaxUnreplicatedInterval());
+ if (getSubstituteRootContext() != null)
+ {
+ store.setSubstituteRootContext(getSubstituteRootContext().booleanValue());
+ }
if (getConnectionName() != null)
{
store.setConnectionName(getConnectionName());
Modified: branches/JBPAPP_5/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/RDBMSStoreBase.java
===================================================================
--- branches/JBPAPP_5/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/RDBMSStoreBase.java 2013-12-19 15:22:15 UTC (rev 114614)
+++ branches/JBPAPP_5/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/RDBMSStoreBase.java 2013-12-19 18:15:56 UTC (rev 114615)
@@ -76,6 +76,11 @@
* Context name associated with this Store
*/
private String name = null;
+
+ /**
+ * Substitute app name for root context with "/" to work around Oracle DB bug (JBPAPP-10206)
+ */
+ private boolean substituteRootContext = false;
/**
* How often to execute the processExpires cleanup
@@ -232,6 +237,10 @@
{
throw new IllegalStateException("Must configure a name for PersistentStore");
}
+ if (substituteRootContext && "".equals(name))
+ {
+ return "/"; // work around Oracle bug with empty strings
+ }
return name;
}
@@ -241,6 +250,25 @@
}
/**
+ * Return whether to use "/" as the app name in the DB for applications in the root context
+ *
+ */
+ public boolean getSubstituteRootContext()
+ {
+ return (this.substituteRootContext);
+ }
+
+ /**
+ * Set whether to use "/" as the app name in the DB for applications in the root context
+ *
+ * @param substituteRootContext whether to do the substitution
+ */
+ public void setSubstituteRootContext(boolean substituteRootContext)
+ {
+ this.substituteRootContext = substituteRootContext;
+ }
+
+ /**
* Return the username to use to connect to the database.
*
*/
From jboss-cvs-commits at lists.jboss.org Thu Dec 19 13:31:03 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Thu, 19 Dec 2013 13:31:03 -0500
Subject: [jboss-cvs] JBossAS SVN: r114616 -
branches/JBPAPP_5/cluster/src/etc.
Message-ID: <201312191831.rBJIV3nC009905@svn01.web.mwc.hst.phx2.redhat.com>
Author: dereed
Date: 2013-12-19 13:31:03 -0500 (Thu, 19 Dec 2013)
New Revision: 114616
Modified:
branches/JBPAPP_5/cluster/src/etc/ha-legacy-jboss-beans.xml
branches/JBPAPP_5/cluster/src/etc/hapartition-jboss-beans.xml
Log:
[JBPAPP-10937] Fix state transfer for EJB2 SFSB with deployment dependencies
Modified: branches/JBPAPP_5/cluster/src/etc/ha-legacy-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5/cluster/src/etc/ha-legacy-jboss-beans.xml 2013-12-19 18:15:56 UTC (rev 114615)
+++ branches/JBPAPP_5/cluster/src/etc/ha-legacy-jboss-beans.xml 2013-12-19 18:31:03 UTC (rev 114616)
@@ -94,8 +94,10 @@
@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HASessionState", exposedInterface=org.jboss.ha.hasessionstate.server.HASessionStateServiceMBean.class, registerDirectly=true)
+ HAPartition
+
-
+
/HASessionState/Default
@@ -121,4 +123,4 @@
-
\ No newline at end of file
+
Modified: branches/JBPAPP_5/cluster/src/etc/hapartition-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5/cluster/src/etc/hapartition-jboss-beans.xml 2013-12-19 18:15:56 UTC (rev 114615)
+++ branches/JBPAPP_5/cluster/src/etc/hapartition-jboss-beans.xml 2013-12-19 18:31:03 UTC (rev 114616)
@@ -24,6 +24,7 @@
class="org.jboss.ha.framework.server.ClusterPartition">
jboss:service=Naming
+ HASessionStateService
@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HAPartition,partition=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class, registerDirectly=true)
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 00:34:14 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 00:34:14 -0500
Subject: [jboss-cvs] JBossAS SVN: r114617 -
branches/JBPAPP_5/component-matrix.
Message-ID: <201312200534.rBK5YEqZ005056@svn01.web.mwc.hst.phx2.redhat.com>
Author: huwang
Date: 2013-12-20 00:34:12 -0500 (Fri, 20 Dec 2013)
New Revision: 114617
Modified:
branches/JBPAPP_5/component-matrix/pom.xml
Log:
JBAPP-10466 Upgrade jboss-ejb3-bom-eap5 to 1.0.5
Modified: branches/JBPAPP_5/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5/component-matrix/pom.xml 2013-12-19 18:31:03 UTC (rev 114616)
+++ branches/JBPAPP_5/component-matrix/pom.xml 2013-12-20 05:34:12 UTC (rev 114617)
@@ -72,7 +72,7 @@
2.2.21.GA
1.0.1.Final
2.0.10.GA
- 1.0.4
+ 1.0.5
5.1.0.SP1
2.0.1.GA
1.3.4.SP6
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 02:25:31 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 02:25:31 -0500
Subject: [jboss-cvs] JBossAS SVN: r114618 -
projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager.
Message-ID: <201312200725.rBK7PVX0020957@svn01.web.mwc.hst.phx2.redhat.com>
Author: istudens at redhat.com
Date: 2013-12-20 02:25:30 -0500 (Fri, 20 Dec 2013)
New Revision: 114618
Modified:
projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/Server.java
Log:
JBPAPP-10661 moving the condition to a better place, it was always null there
Modified: projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/Server.java
===================================================================
--- projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/Server.java 2013-12-20 05:34:12 UTC (rev 114617)
+++ projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/Server.java 2013-12-20 07:25:30 UTC (rev 114618)
@@ -239,8 +239,7 @@
*/
public void addArg(Argument arg)
{
- if (arg.getValue() != null && arg.getValue().isEmpty() == false)
- arguments.add(arg);
+ arguments.add(arg);
}
/**
@@ -253,7 +252,8 @@
final List args = new ArrayList();
for (Argument argument : arguments)
{
- args.add(argument.getValue());
+ if (argument.getValue() != null && argument.getValue().isEmpty() == false)
+ args.add(argument.getValue());
}
return args;
}
@@ -281,8 +281,7 @@
*/
public void addJvmArg(Argument arg)
{
- if (arg.getValue() != null && arg.getValue().isEmpty() == false)
- jvmArguments.add(arg);
+ jvmArguments.add(arg);
}
/**
@@ -295,7 +294,8 @@
final List args = new ArrayList();
for (Argument argument : jvmArguments)
{
- args.add(argument.getValue());
+ if (argument.getValue() != null && argument.getValue().isEmpty() == false)
+ args.add(argument.getValue());
}
return args;
}
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 02:26:47 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 02:26:47 -0500
Subject: [jboss-cvs] JBossAS SVN: r114619 -
projects/server-manager/branches/1.0.2.GA_CP.
Message-ID: <201312200726.rBK7Qlwa020979@svn01.web.mwc.hst.phx2.redhat.com>
Author: istudens at redhat.com
Date: 2013-12-20 02:26:47 -0500 (Fri, 20 Dec 2013)
New Revision: 114619
Modified:
projects/server-manager/branches/1.0.2.GA_CP/pom.xml
Log:
preparing for 1.0.2.GA_CP03 tag
Modified: projects/server-manager/branches/1.0.2.GA_CP/pom.xml
===================================================================
--- projects/server-manager/branches/1.0.2.GA_CP/pom.xml 2013-12-20 07:25:30 UTC (rev 114618)
+++ projects/server-manager/branches/1.0.2.GA_CP/pom.xml 2013-12-20 07:26:47 UTC (rev 114619)
@@ -13,15 +13,15 @@
org.jboss.jbossas
jboss-server-manager
- 1.0.2.GA_CP-SNAPSHOT
+ 1.0.2.GA_CP03
JBossAS Server Manager
- scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/server-manager/branches/1.0.2.GA_CP
- scm:svn:https://svn.jboss.org/repos/jbossas/projects/server-manager/branches/1.0.2.GA_CP
- http://anonsvn.jboss.org/repos/maven/jbossas/projects/server-manager/branches/1.0.2.GA_CP
+ scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/server-manager/tags/1.0.2.GA_CP03
+ scm:svn:https://svn.jboss.org/repos/jbossas/projects/server-manager/tags/1.0.2.GA_CP03
+ http://anonsvn.jboss.org/repos/maven/jbossas/projects/server-manager/tags/1.0.2.GA_CP03
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 02:28:08 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 02:28:08 -0500
Subject: [jboss-cvs] JBossAS SVN: r114620 - projects/server-manager/tags.
Message-ID: <201312200728.rBK7S8q7021003@svn01.web.mwc.hst.phx2.redhat.com>
Author: istudens at redhat.com
Date: 2013-12-20 02:28:08 -0500 (Fri, 20 Dec 2013)
New Revision: 114620
Added:
projects/server-manager/tags/1.0.2.GA_CP03/
Log:
tagging 1.0.2.GA_CP03
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 03:10:43 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 03:10:43 -0500
Subject: [jboss-cvs] JBossAS SVN: r114621 -
branches/JBPAPP_5/tomcat/src/webapps/ROOT.war.
Message-ID: <201312200810.rBK8AhFO029117@svn01.web.mwc.hst.phx2.redhat.com>
Author: ehugonnet
Date: 2013-12-20 03:10:43 -0500 (Fri, 20 Dec 2013)
New Revision: 114621
Modified:
branches/JBPAPP_5/tomcat/src/webapps/ROOT.war/index.html
Log:
JBPAPP-10412: Welcome page says Tomcat status instead of JBossWeb status.
Modified: branches/JBPAPP_5/tomcat/src/webapps/ROOT.war/index.html
===================================================================
--- branches/JBPAPP_5/tomcat/src/webapps/ROOT.war/index.html 2013-12-20 07:28:08 UTC (rev 114620)
+++ branches/JBPAPP_5/tomcat/src/webapps/ROOT.war/index.html 2013-12-20 08:10:43 UTC (rev 114621)
@@ -21,7 +21,7 @@
JMX Console
JBoss Web Console
JBoss WS Console
- Tomcat status
+ JBossWeb status
(full)
(XML)
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 03:13:58 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 03:13:58 -0500
Subject: [jboss-cvs] JBossAS SVN: r114622 - in branches/JBPAPP_5: testsuite
and 1 other directories.
Message-ID: <201312200813.rBK8Dw59029215@svn01.web.mwc.hst.phx2.redhat.com>
Author: ehugonnet
Date: 2013-12-20 03:13:58 -0500 (Fri, 20 Dec 2013)
New Revision: 114622
Modified:
branches/JBPAPP_5/build/build.xml
branches/JBPAPP_5/testsuite/build.xml
branches/JBPAPP_5/tools/etc/buildmagic/version-info.xml
Log:
JBPAPP-10720: Merge build/build.properties and tools/etc/buildmagic/version-info.xml
version-info.xml is using build.properties.
The builds make a reference to the dir in which the build.properties is.
Modified: branches/JBPAPP_5/build/build.xml
===================================================================
--- branches/JBPAPP_5/build/build.xml 2013-12-20 08:10:43 UTC (rev 114621)
+++ branches/JBPAPP_5/build/build.xml 2013-12-20 08:13:58 UTC (rev 114622)
@@ -15,7 +15,7 @@
-
+
Modified: branches/JBPAPP_5/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5/testsuite/build.xml 2013-12-20 08:10:43 UTC (rev 114621)
+++ branches/JBPAPP_5/testsuite/build.xml 2013-12-20 08:13:58 UTC (rev 114622)
@@ -15,6 +15,8 @@
+
+
@@ -27,7 +29,6 @@
-
@@ -1798,20 +1799,32 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
@@ -1833,7 +1846,25 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -14,11 +15,11 @@
-
+
@@ -36,6 +37,7 @@
+ configuration = ${configuration.directory}/build.properties
version.major=${version.major}
version.minor=${version.minor}
version.revision=${version.revision}
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 04:05:05 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 04:05:05 -0500
Subject: [jboss-cvs] JBossAS SVN: r114623 -
projects/ejb3/trunk/testsuite/src/test/resources/test/consumer/META-INF.
Message-ID: <201312200905.rBK955jZ005295@svn01.web.mwc.hst.phx2.redhat.com>
Author: soul2zimate
Date: 2013-12-20 04:05:04 -0500 (Fri, 20 Dec 2013)
New Revision: 114623
Modified:
projects/ejb3/trunk/testsuite/src/test/resources/test/consumer/META-INF/jboss.xml
Log:
remove wrong introduced in JBPAPP-10659
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/consumer/META-INF/jboss.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/consumer/META-INF/jboss.xml 2013-12-20 08:13:58 UTC (rev 114622)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/consumer/META-INF/jboss.xml 2013-12-20 09:05:04 UTC (rev 114623)
@@ -11,12 +11,6 @@
org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestConsumer
queue/consumertest
javax.jms.Queue
-
-
- maxSession
- 1
-
-
org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestRemote
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 05:53:33 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 05:53:33 -0500
Subject: [jboss-cvs] JBossAS SVN: r114624 - in branches/JBPAPP_5: testsuite
and 1 other directories.
Message-ID: <201312201053.rBKArXGQ015218@svn01.web.mwc.hst.phx2.redhat.com>
Author: wolfc
Date: 2013-12-20 05:53:33 -0500 (Fri, 20 Dec 2013)
New Revision: 114624
Modified:
branches/JBPAPP_5/build/build.xml
branches/JBPAPP_5/testsuite/build.xml
branches/JBPAPP_5/tools/etc/buildmagic/version-info.xml
Log:
JBPAPP-10720: reverting 114622 (bad commit)
Modified: branches/JBPAPP_5/build/build.xml
===================================================================
--- branches/JBPAPP_5/build/build.xml 2013-12-20 09:05:04 UTC (rev 114623)
+++ branches/JBPAPP_5/build/build.xml 2013-12-20 10:53:33 UTC (rev 114624)
@@ -15,7 +15,7 @@
-
+
Modified: branches/JBPAPP_5/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5/testsuite/build.xml 2013-12-20 09:05:04 UTC (rev 114623)
+++ branches/JBPAPP_5/testsuite/build.xml 2013-12-20 10:53:33 UTC (rev 114624)
@@ -15,8 +15,6 @@
-
-
@@ -29,6 +27,7 @@
+
@@ -1799,32 +1798,20 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
@@ -1846,25 +1833,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
@@ -15,11 +14,11 @@
-
+
@@ -37,7 +36,6 @@
- configuration = ${configuration.directory}/build.properties
version.major=${version.major}
version.minor=${version.minor}
version.revision=${version.revision}
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 06:12:36 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 06:12:36 -0500
Subject: [jboss-cvs] JBossAS SVN: r114625 - in branches/JBPAPP_5: testsuite
and 1 other directories.
Message-ID: <201312201112.rBKBCaa5022191@svn01.web.mwc.hst.phx2.redhat.com>
Author: ehugonnet
Date: 2013-12-20 06:12:35 -0500 (Fri, 20 Dec 2013)
New Revision: 114625
Modified:
branches/JBPAPP_5/build/build.xml
branches/JBPAPP_5/testsuite/build.xml
branches/JBPAPP_5/tools/etc/buildmagic/version-info.xml
Log:
JBPAPP-10720: Merge build/build.properties and tools/etc/buildmagic/version-info.xml
version-info.xml is using build.properties.
The builds make a reference to the dir in which the build.properties is.
Modified: branches/JBPAPP_5/build/build.xml
===================================================================
--- branches/JBPAPP_5/build/build.xml 2013-12-20 10:53:33 UTC (rev 114624)
+++ branches/JBPAPP_5/build/build.xml 2013-12-20 11:12:35 UTC (rev 114625)
@@ -19,7 +19,7 @@
-
+
Modified: branches/JBPAPP_5/tools/etc/buildmagic/version-info.xml
===================================================================
--- branches/JBPAPP_5/tools/etc/buildmagic/version-info.xml 2013-12-20 10:53:33 UTC (rev 114624)
+++ branches/JBPAPP_5/tools/etc/buildmagic/version-info.xml 2013-12-20 11:12:35 UTC (rev 114625)
@@ -5,6 +5,7 @@
+
@@ -14,11 +15,6 @@
-
-
-
-
-
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 09:12:36 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 09:12:36 -0500
Subject: [jboss-cvs] JBossAS SVN: r114626 -
projects/security/security-negotiation/trunk.
Message-ID: <201312201412.rBKECafh015041@svn01.web.mwc.hst.phx2.redhat.com>
Author: darran.lofthouse at jboss.com
Date: 2013-12-20 09:12:36 -0500 (Fri, 20 Dec 2013)
New Revision: 114626
Added:
projects/security/security-negotiation/trunk/README.txt
Removed:
projects/security/security-negotiation/trunk/docs/
projects/security/security-negotiation/trunk/jboss-negotiation-common/
projects/security/security-negotiation/trunk/jboss-negotiation-extras/
projects/security/security-negotiation/trunk/jboss-negotiation-net/
projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/
projects/security/security-negotiation/trunk/jboss-negotiation-spnego/
projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/
projects/security/security-negotiation/trunk/parent/
projects/security/security-negotiation/trunk/pom.xml
Log:
[SECURITY-764] Relocate JBoss Negotiation code to git.
Added: projects/security/security-negotiation/trunk/README.txt
===================================================================
--- projects/security/security-negotiation/trunk/README.txt (rev 0)
+++ projects/security/security-negotiation/trunk/README.txt 2013-12-20 14:12:36 UTC (rev 114626)
@@ -0,0 +1,3 @@
+The code for JBoss Negotiation has now been reloacted to git and can be found at the following location: -
+ https://github.com/wildfly/jboss-negotiation/tree/master
+
Property changes on: projects/security/security-negotiation/trunk/README.txt
___________________________________________________________________
Added: svn:keywords
+ Id Revision
Added: svn:eol-style
+ LF
Deleted: projects/security/security-negotiation/trunk/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/pom.xml 2013-12-20 11:12:35 UTC (rev 114625)
+++ projects/security/security-negotiation/trunk/pom.xml 2013-12-20 14:12:36 UTC (rev 114626)
@@ -1,29 +0,0 @@
-
-
-
- org.jboss.security
- jboss-negotiation-project
- 2.2.7.Final-SNAPSHOT
- parent/pom.xml
-
- 4.0.0
- org.jboss.security
- jboss-negotiation-main
- pom
- JBoss Negotiation Aggregator
- http://labs.jboss.org/portal/jbosssecurity/
- JBoss Security is a cross cutting project that handles security for the JEMS projects
-
- parent
- jboss-negotiation-common
- jboss-negotiation-extras
- jboss-negotiation-net
- jboss-negotiation-ntlm
- jboss-negotiation-spnego
- jboss-negotiation-toolkit
-
-
- scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/security/security-negotiation/trunk
- scm:svn:https://svn.jboss.org/repos/jbossas/projects/security/security-negotiation/trunk
-
-
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 09:13:48 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 09:13:48 -0500
Subject: [jboss-cvs] JBossAS SVN: r114627 -
projects/security/security-negotiation/trunk.
Message-ID: <201312201413.rBKEDmxx015079@svn01.web.mwc.hst.phx2.redhat.com>
Author: darran.lofthouse at jboss.com
Date: 2013-12-20 09:13:48 -0500 (Fri, 20 Dec 2013)
New Revision: 114627
Removed:
projects/security/security-negotiation/trunk/.gitignore
projects/security/security-negotiation/trunk/.project
Log:
[SECURITY-764] Relocate JBoss Negotiation code to git.
Deleted: projects/security/security-negotiation/trunk/.gitignore
===================================================================
--- projects/security/security-negotiation/trunk/.gitignore 2013-12-20 14:12:36 UTC (rev 114626)
+++ projects/security/security-negotiation/trunk/.gitignore 2013-12-20 14:13:48 UTC (rev 114627)
@@ -1,9 +0,0 @@
-.settings
-assembly/target
-jboss-negotiation-common/target
-jboss-negotiation-extras/target
-jboss-negotiation-net/target
-jboss-negotiation-ntlm/target
-jboss-negotiation-spnego/target
-jboss-negotiation-toolkit/target
-*.iml
\ No newline at end of file
Deleted: projects/security/security-negotiation/trunk/.project
===================================================================
--- projects/security/security-negotiation/trunk/.project 2013-12-20 14:12:36 UTC (rev 114626)
+++ projects/security/security-negotiation/trunk/.project 2013-12-20 14:13:48 UTC (rev 114627)
@@ -1,23 +0,0 @@
-
-
- jboss-negotiation-main
-
-
-
-
-
- org.maven.ide.eclipse.maven2Builder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.m2e.core.maven2Nature
- org.maven.ide.eclipse.maven2Nature
-
-
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 09:17:31 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 09:17:31 -0500
Subject: [jboss-cvs] JBossAS SVN: r114628 -
projects/security/security-negotiation/branches/security-negotiation-2.1.x.
Message-ID: <201312201417.rBKEHV7l015110@svn01.web.mwc.hst.phx2.redhat.com>
Author: darran.lofthouse at jboss.com
Date: 2013-12-20 09:17:31 -0500 (Fri, 20 Dec 2013)
New Revision: 114628
Added:
projects/security/security-negotiation/branches/security-negotiation-2.1.x/README.txt
Removed:
projects/security/security-negotiation/branches/security-negotiation-2.1.x/.gitignore
projects/security/security-negotiation/branches/security-negotiation-2.1.x/.project
projects/security/security-negotiation/branches/security-negotiation-2.1.x/assembly/
projects/security/security-negotiation/branches/security-negotiation-2.1.x/docs/
projects/security/security-negotiation/branches/security-negotiation-2.1.x/jboss-negotiation-common/
projects/security/security-negotiation/branches/security-negotiation-2.1.x/jboss-negotiation-extras/
projects/security/security-negotiation/branches/security-negotiation-2.1.x/jboss-negotiation-net/
projects/security/security-negotiation/branches/security-negotiation-2.1.x/jboss-negotiation-ntlm/
projects/security/security-negotiation/branches/security-negotiation-2.1.x/jboss-negotiation-spnego/
projects/security/security-negotiation/branches/security-negotiation-2.1.x/jboss-negotiation-toolkit/
projects/security/security-negotiation/branches/security-negotiation-2.1.x/parent/
projects/security/security-negotiation/branches/security-negotiation-2.1.x/pom.xml
Log:
[SECURITY-764] Relocate JBoss Negotiation code to git.
Deleted: projects/security/security-negotiation/branches/security-negotiation-2.1.x/.gitignore
===================================================================
--- projects/security/security-negotiation/branches/security-negotiation-2.1.x/.gitignore 2013-12-20 14:13:48 UTC (rev 114627)
+++ projects/security/security-negotiation/branches/security-negotiation-2.1.x/.gitignore 2013-12-20 14:17:31 UTC (rev 114628)
@@ -1,8 +0,0 @@
-.settings
-assembly/target
-jboss-negotiation-common/target
-jboss-negotiation-extras/target
-jboss-negotiation-net/target
-jboss-negotiation-ntlm/target
-jboss-negotiation-spnego/target
-jboss-negotiation-toolkit/target
\ No newline at end of file
Deleted: projects/security/security-negotiation/branches/security-negotiation-2.1.x/.project
===================================================================
--- projects/security/security-negotiation/branches/security-negotiation-2.1.x/.project 2013-12-20 14:13:48 UTC (rev 114627)
+++ projects/security/security-negotiation/branches/security-negotiation-2.1.x/.project 2013-12-20 14:17:31 UTC (rev 114628)
@@ -1,23 +0,0 @@
-
-
- jboss-negotiation-main
-
-
-
-
-
- org.maven.ide.eclipse.maven2Builder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.m2e.core.maven2Nature
- org.maven.ide.eclipse.maven2Nature
-
-
Added: projects/security/security-negotiation/branches/security-negotiation-2.1.x/README.txt
===================================================================
--- projects/security/security-negotiation/branches/security-negotiation-2.1.x/README.txt (rev 0)
+++ projects/security/security-negotiation/branches/security-negotiation-2.1.x/README.txt 2013-12-20 14:17:31 UTC (rev 114628)
@@ -0,0 +1,3 @@
+The code for JBoss Negotiation has now been reloacted to git and can be found at the following location: -
+ https://github.com/wildfly/jboss-negotiation/tree/security-negotiation-2.1.x
+
Property changes on: projects/security/security-negotiation/branches/security-negotiation-2.1.x/README.txt
___________________________________________________________________
Added: svn:keywords
+ Id Revision
Added: svn:eol-style
+ LF
Deleted: projects/security/security-negotiation/branches/security-negotiation-2.1.x/pom.xml
===================================================================
--- projects/security/security-negotiation/branches/security-negotiation-2.1.x/pom.xml 2013-12-20 14:13:48 UTC (rev 114627)
+++ projects/security/security-negotiation/branches/security-negotiation-2.1.x/pom.xml 2013-12-20 14:17:31 UTC (rev 114628)
@@ -1,30 +0,0 @@
-
-
-
- org.jboss.security
- jboss-negotiation-project
- 2.1.5.SNAPSHOT
- parent/pom.xml
-
- 4.0.0
- org.jboss.security
- jboss-negotiation-main
- pom
- JBoss Negotiation Aggregator
- http://labs.jboss.org/portal/jbosssecurity/
- JBoss Security is a cross cutting project that handles security for the JEMS projects
-
- parent
- jboss-negotiation-common
- jboss-negotiation-extras
- jboss-negotiation-net
- jboss-negotiation-ntlm
- jboss-negotiation-spnego
- jboss-negotiation-toolkit
- assembly
-
-
- scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/security/security-negotiation/trunk
- scm:svn:https://svn.jboss.org/repos/jbossas/projects/security/security-negotiation/trunk
-
-
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 09:19:49 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 09:19:49 -0500
Subject: [jboss-cvs] JBossAS SVN: r114629 -
projects/security/security-negotiation/branches/security-negotiation-2.0.x.
Message-ID: <201312201419.rBKEJnJT015151@svn01.web.mwc.hst.phx2.redhat.com>
Author: darran.lofthouse at jboss.com
Date: 2013-12-20 09:19:49 -0500 (Fri, 20 Dec 2013)
New Revision: 114629
Added:
projects/security/security-negotiation/branches/security-negotiation-2.0.x/README.txt
Removed:
projects/security/security-negotiation/branches/security-negotiation-2.0.x/assembly/
projects/security/security-negotiation/branches/security-negotiation-2.0.x/docs/
projects/security/security-negotiation/branches/security-negotiation-2.0.x/jboss-negotiation-common/
projects/security/security-negotiation/branches/security-negotiation-2.0.x/jboss-negotiation-extras/
projects/security/security-negotiation/branches/security-negotiation-2.0.x/jboss-negotiation-ntlm/
projects/security/security-negotiation/branches/security-negotiation-2.0.x/jboss-negotiation-spnego/
projects/security/security-negotiation/branches/security-negotiation-2.0.x/jboss-negotiation-toolkit/
projects/security/security-negotiation/branches/security-negotiation-2.0.x/parent/
projects/security/security-negotiation/branches/security-negotiation-2.0.x/pom.xml
Log:
[SECURITY-764] Relocate JBoss Negotiation code to git.
Added: projects/security/security-negotiation/branches/security-negotiation-2.0.x/README.txt
===================================================================
--- projects/security/security-negotiation/branches/security-negotiation-2.0.x/README.txt (rev 0)
+++ projects/security/security-negotiation/branches/security-negotiation-2.0.x/README.txt 2013-12-20 14:19:49 UTC (rev 114629)
@@ -0,0 +1,3 @@
+The code for JBoss Negotiation has now been reloacted to git and can be found at the following location: -
+ https://github.com/wildfly/jboss-negotiation/tree/security-negotiation-2.0.x
+
Property changes on: projects/security/security-negotiation/branches/security-negotiation-2.0.x/README.txt
___________________________________________________________________
Added: svn:keywords
+ Id Revision
Added: svn:eol-style
+ LF
Deleted: projects/security/security-negotiation/branches/security-negotiation-2.0.x/pom.xml
===================================================================
--- projects/security/security-negotiation/branches/security-negotiation-2.0.x/pom.xml 2013-12-20 14:17:31 UTC (rev 114628)
+++ projects/security/security-negotiation/branches/security-negotiation-2.0.x/pom.xml 2013-12-20 14:19:49 UTC (rev 114629)
@@ -1,29 +0,0 @@
-
-
-
- org.jboss.security
- jboss-negotiation-project
- 2.0.5.GA-SNAPSHOT
- parent/pom.xml
-
- 4.0.0
- org.jboss.security
- jboss-negotiation-main
- pom
- JBoss Negotiation Aggregator
- http://labs.jboss.org/portal/jbosssecurity/
- JBoss Security is a cross cutting project that handles security for the JEMS projects
-
- parent
- jboss-negotiation-common
- jboss-negotiation-extras
- jboss-negotiation-ntlm
- jboss-negotiation-spnego
- jboss-negotiation-toolkit
- assembly
-
-
- scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/security/security-negotiation/trunk
- scm:svn:https://svn.jboss.org/repos/jbossas/projects/security/security-negotiation/trunk
-
-
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 09:23:08 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 09:23:08 -0500
Subject: [jboss-cvs] JBossAS SVN: r114630 -
projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP.
Message-ID: <201312201423.rBKEN89m015293@svn01.web.mwc.hst.phx2.redhat.com>
Author: darran.lofthouse at jboss.com
Date: 2013-12-20 09:23:08 -0500 (Fri, 20 Dec 2013)
New Revision: 114630
Added:
projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP/README.txt
Removed:
projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP/assembly/
projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP/docs/
projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP/jboss-negotiation-common/
projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP/jboss-negotiation-extras/
projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP/jboss-negotiation-ntlm/
projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP/jboss-negotiation-spnego/
projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP/jboss-negotiation-toolkit/
projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP/parent/
projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP/pom.xml
Log:
[SECURITY-764] Relocate JBoss Negotiation code to git.
Added: projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP/README.txt
===================================================================
--- projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP/README.txt (rev 0)
+++ projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP/README.txt 2013-12-20 14:23:08 UTC (rev 114630)
@@ -0,0 +1,3 @@
+The code for JBoss Negotiation has now been reloacted to git and can be found at the following location: -
+ https://github.com/wildfly/jboss-negotiation/tree/security-negotiation-2.0.3.SP
+
Property changes on: projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP/README.txt
___________________________________________________________________
Added: svn:keywords
+ Id Revision
Added: svn:eol-style
+ LF
Deleted: projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP/pom.xml
===================================================================
--- projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP/pom.xml 2013-12-20 14:19:49 UTC (rev 114629)
+++ projects/security/security-negotiation/branches/security-negotiation-2.0.3.SP/pom.xml 2013-12-20 14:23:08 UTC (rev 114630)
@@ -1,29 +0,0 @@
-
-
-
- org.jboss.security
- jboss-negotiation-project
- 2.0.3.SP
- parent/pom.xml
-
- 4.0.0
- org.jboss.security
- jboss-negotiation-main
- pom
- JBoss Negotiation Aggregator
- http://labs.jboss.org/portal/jbosssecurity/
- JBoss Security is a cross cutting project that handles security for the JEMS projects
-
- parent
- jboss-negotiation-common
- jboss-negotiation-extras
- jboss-negotiation-ntlm
- jboss-negotiation-spnego
- jboss-negotiation-toolkit
- assembly
-
-
- scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/security/security-negotiation/trunk
- scm:svn:https://svn.jboss.org/repos/jbossas/projects/security/security-negotiation/trunk
-
-
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 09:29:54 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 09:29:54 -0500
Subject: [jboss-cvs] JBossAS SVN: r114631 - in
projects/security/security-spi/branches/Branch_2_0: acl and 6
other directories.
Message-ID: <201312201429.rBKETscW015362@svn01.web.mwc.hst.phx2.redhat.com>
Author: pskopek
Date: 2013-12-20 09:29:53 -0500 (Fri, 20 Dec 2013)
New Revision: 114631
Modified:
projects/security/security-spi/branches/Branch_2_0/acl/pom.xml
projects/security/security-spi/branches/Branch_2_0/assembly/pom.xml
projects/security/security-spi/branches/Branch_2_0/authorization/pom.xml
projects/security/security-spi/branches/Branch_2_0/identity/pom.xml
projects/security/security-spi/branches/Branch_2_0/jboss-security-spi-as4/pom.xml
projects/security/security-spi/branches/Branch_2_0/parent/pom.xml
projects/security/security-spi/branches/Branch_2_0/pom.xml
projects/security/security-spi/branches/Branch_2_0/spi/pom.xml
Log:
Version change for release 2.0.6.Final
Modified: projects/security/security-spi/branches/Branch_2_0/acl/pom.xml
===================================================================
--- projects/security/security-spi/branches/Branch_2_0/acl/pom.xml 2013-12-20 14:23:08 UTC (rev 114630)
+++ projects/security/security-spi/branches/Branch_2_0/acl/pom.xml 2013-12-20 14:29:53 UTC (rev 114631)
@@ -2,7 +2,7 @@
org.jboss.security
jboss-security-spi-parent
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
../parent
4.0.0
Modified: projects/security/security-spi/branches/Branch_2_0/assembly/pom.xml
===================================================================
--- projects/security/security-spi/branches/Branch_2_0/assembly/pom.xml 2013-12-20 14:23:08 UTC (rev 114630)
+++ projects/security/security-spi/branches/Branch_2_0/assembly/pom.xml 2013-12-20 14:29:53 UTC (rev 114631)
@@ -2,7 +2,7 @@
org.jboss.security
jboss-security-spi-parent
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
../parent
4.0.0
Modified: projects/security/security-spi/branches/Branch_2_0/authorization/pom.xml
===================================================================
--- projects/security/security-spi/branches/Branch_2_0/authorization/pom.xml 2013-12-20 14:23:08 UTC (rev 114630)
+++ projects/security/security-spi/branches/Branch_2_0/authorization/pom.xml 2013-12-20 14:29:53 UTC (rev 114631)
@@ -2,7 +2,7 @@
org.jboss.security
jboss-security-spi-parent
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
../parent
4.0.0
Modified: projects/security/security-spi/branches/Branch_2_0/identity/pom.xml
===================================================================
--- projects/security/security-spi/branches/Branch_2_0/identity/pom.xml 2013-12-20 14:23:08 UTC (rev 114630)
+++ projects/security/security-spi/branches/Branch_2_0/identity/pom.xml 2013-12-20 14:29:53 UTC (rev 114631)
@@ -2,7 +2,7 @@
org.jboss.security
jboss-security-spi-parent
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
../parent
4.0.0
Modified: projects/security/security-spi/branches/Branch_2_0/jboss-security-spi-as4/pom.xml
===================================================================
--- projects/security/security-spi/branches/Branch_2_0/jboss-security-spi-as4/pom.xml 2013-12-20 14:23:08 UTC (rev 114630)
+++ projects/security/security-spi/branches/Branch_2_0/jboss-security-spi-as4/pom.xml 2013-12-20 14:29:53 UTC (rev 114631)
@@ -2,7 +2,7 @@
org.jboss.security
jboss-security-spi-parent
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
../parent
4.0.0
Modified: projects/security/security-spi/branches/Branch_2_0/parent/pom.xml
===================================================================
--- projects/security/security-spi/branches/Branch_2_0/parent/pom.xml 2013-12-20 14:23:08 UTC (rev 114630)
+++ projects/security/security-spi/branches/Branch_2_0/parent/pom.xml 2013-12-20 14:29:53 UTC (rev 114631)
@@ -8,7 +8,7 @@
org.jboss.security
jboss-security-spi-parent
pom
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
JBoss Security SPI - Parent
http://labs.jboss.org/portal/jbosssecurity/
JBoss Security is a cross cutting project that handles security for the JEMS projects
Modified: projects/security/security-spi/branches/Branch_2_0/pom.xml
===================================================================
--- projects/security/security-spi/branches/Branch_2_0/pom.xml 2013-12-20 14:23:08 UTC (rev 114630)
+++ projects/security/security-spi/branches/Branch_2_0/pom.xml 2013-12-20 14:29:53 UTC (rev 114631)
@@ -2,7 +2,7 @@
org.jboss.security
jboss-security-spi-parent
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
parent
4.0.0
Modified: projects/security/security-spi/branches/Branch_2_0/spi/pom.xml
===================================================================
--- projects/security/security-spi/branches/Branch_2_0/spi/pom.xml 2013-12-20 14:23:08 UTC (rev 114630)
+++ projects/security/security-spi/branches/Branch_2_0/spi/pom.xml 2013-12-20 14:29:53 UTC (rev 114631)
@@ -2,7 +2,7 @@
org.jboss.security
jboss-security-spi-parent
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
../parent
4.0.0
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 09:31:36 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 09:31:36 -0500
Subject: [jboss-cvs] JBossAS SVN: r114632 -
projects/security/security-spi/tags.
Message-ID: <201312201431.rBKEVa8L015519@svn01.web.mwc.hst.phx2.redhat.com>
Author: pskopek
Date: 2013-12-20 09:31:36 -0500 (Fri, 20 Dec 2013)
New Revision: 114632
Added:
projects/security/security-spi/tags/2.0.6.Final/
Log:
tagging the release 2.0.6.Final
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 09:36:46 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 09:36:46 -0500
Subject: [jboss-cvs] JBossAS SVN: r114633 -
projects/server-manager/branches/1.0.2.GA_CP.
Message-ID: <201312201436.rBKEak1t016239@svn01.web.mwc.hst.phx2.redhat.com>
Author: istudens at redhat.com
Date: 2013-12-20 09:36:46 -0500 (Fri, 20 Dec 2013)
New Revision: 114633
Modified:
projects/server-manager/branches/1.0.2.GA_CP/pom.xml
Log:
back to the branch
Modified: projects/server-manager/branches/1.0.2.GA_CP/pom.xml
===================================================================
--- projects/server-manager/branches/1.0.2.GA_CP/pom.xml 2013-12-20 14:31:36 UTC (rev 114632)
+++ projects/server-manager/branches/1.0.2.GA_CP/pom.xml 2013-12-20 14:36:46 UTC (rev 114633)
@@ -13,15 +13,15 @@
org.jboss.jbossas
jboss-server-manager
- 1.0.2.GA_CP03
+ 1.0.2.GA_CP-SNAPSHOT
JBossAS Server Manager
- scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/server-manager/tags/1.0.2.GA_CP03
- scm:svn:https://svn.jboss.org/repos/jbossas/projects/server-manager/tags/1.0.2.GA_CP03
- http://anonsvn.jboss.org/repos/maven/jbossas/projects/server-manager/tags/1.0.2.GA_CP03
+ scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/server-manager/branches/1.0.2.GA_CP
+ scm:svn:https://svn.jboss.org/repos/jbossas/projects/server-manager/branches/1.0.2.GA_CP
+ http://anonsvn.jboss.org/repos/maven/jbossas/projects/server-manager/branches/1.0.2.GA_CP
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 09:56:58 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 09:56:58 -0500
Subject: [jboss-cvs] JBossAS SVN: r114634 - in
projects/security/security-jboss-sx/branches/Branch_2_0: acl
and 7 other directories.
Message-ID: <201312201456.rBKEuwTe016613@svn01.web.mwc.hst.phx2.redhat.com>
Author: pskopek
Date: 2013-12-20 09:56:58 -0500 (Fri, 20 Dec 2013)
New Revision: 114634
Modified:
projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml
projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml
projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml
projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml
projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml
Log:
Version change for release 2.0.6.Final
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml 2013-12-20 14:36:46 UTC (rev 114633)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml 2013-12-20 14:56:58 UTC (rev 114634)
@@ -2,7 +2,7 @@
org.jboss.security
jbosssx-parent
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
../parent
4.0.0
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml 2013-12-20 14:36:46 UTC (rev 114633)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml 2013-12-20 14:56:58 UTC (rev 114634)
@@ -2,7 +2,7 @@
org.jboss.security
jbosssx-parent
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
../parent
4.0.0
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml 2013-12-20 14:36:46 UTC (rev 114633)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml 2013-12-20 14:56:58 UTC (rev 114634)
@@ -2,7 +2,7 @@
org.jboss.security
jbosssx-parent
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
../parent
4.0.0
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml 2013-12-20 14:36:46 UTC (rev 114633)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml 2013-12-20 14:56:58 UTC (rev 114634)
@@ -2,7 +2,7 @@
org.jboss.security
jbosssx-parent
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
../parent
4.0.0
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml 2013-12-20 14:36:46 UTC (rev 114633)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml 2013-12-20 14:56:58 UTC (rev 114634)
@@ -2,7 +2,7 @@
org.jboss.security
jbosssx-parent
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
../parent
4.0.0
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml 2013-12-20 14:36:46 UTC (rev 114633)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml 2013-12-20 14:56:58 UTC (rev 114634)
@@ -7,7 +7,7 @@
4.0.0
org.jboss.security
jbosssx-client
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
jar
JBoss Security Client
http://www.jboss.org
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml 2013-12-20 14:36:46 UTC (rev 114633)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml 2013-12-20 14:56:58 UTC (rev 114634)
@@ -3,7 +3,7 @@
org.jboss.security
jbosssx-parent
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
../parent
4.0.0
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml 2013-12-20 14:36:46 UTC (rev 114633)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml 2013-12-20 14:56:58 UTC (rev 114634)
@@ -8,7 +8,7 @@
org.jboss.security
jbosssx-parent
pom
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
JBossSX - Parent
http://labs.jboss.org/portal/jbosssecurity/
JBoss Security is a cross cutting project that handles security for the JEMS projects
@@ -185,6 +185,6 @@
GA
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml 2013-12-20 14:36:46 UTC (rev 114633)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml 2013-12-20 14:56:58 UTC (rev 114634)
@@ -7,7 +7,7 @@
4.0.0
org.jboss.security
jbosssx-pom
- 2.0.6-SNAPSHOT
+ 2.0.6.Final
pom
JBoss Security Implementation for the JBAS - Parent
http://labs.jboss.org/portal/jbosssecurity/
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 09:58:32 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 09:58:32 -0500
Subject: [jboss-cvs] JBossAS SVN: r114635 -
projects/security/security-jboss-sx/tags.
Message-ID: <201312201458.rBKEwW3N016652@svn01.web.mwc.hst.phx2.redhat.com>
Author: pskopek
Date: 2013-12-20 09:58:32 -0500 (Fri, 20 Dec 2013)
New Revision: 114635
Added:
projects/security/security-jboss-sx/tags/2.0.6.Final/
Log:
tagging the release 2.0.6.Final
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 11:08:47 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 11:08:47 -0500
Subject: [jboss-cvs] JBossAS SVN: r114636 -
branches/JBPAPP_5/component-matrix.
Message-ID: <201312201608.rBKG8lTC031863@svn01.web.mwc.hst.phx2.redhat.com>
Author: huwang
Date: 2013-12-20 11:08:47 -0500 (Fri, 20 Dec 2013)
New Revision: 114636
Modified:
branches/JBPAPP_5/component-matrix/pom.xml
Log:
JBPAPP-10360 Upgrade jboss-server-manager to 1.0.2.GA_CP03
Modified: branches/JBPAPP_5/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5/component-matrix/pom.xml 2013-12-20 14:58:32 UTC (rev 114635)
+++ branches/JBPAPP_5/component-matrix/pom.xml 2013-12-20 16:08:47 UTC (rev 114636)
@@ -90,7 +90,7 @@
2.0.5.SP3-1
2.1.4.GA
1.0.6.FINAL
- 1.0.2.GA
+ 1.0.2.GA_CP03
1.0.0.GA
2.2.3.GA
1.0.1.GA
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 12:00:18 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 12:00:18 -0500
Subject: [jboss-cvs] JBossAS SVN: r114637 - in
projects/security/security-spi/branches/Branch_2_0: acl and 6
other directories.
Message-ID: <201312201700.rBKH0I2l007152@svn01.web.mwc.hst.phx2.redhat.com>
Author: pskopek
Date: 2013-12-20 12:00:18 -0500 (Fri, 20 Dec 2013)
New Revision: 114637
Modified:
projects/security/security-spi/branches/Branch_2_0/acl/pom.xml
projects/security/security-spi/branches/Branch_2_0/assembly/pom.xml
projects/security/security-spi/branches/Branch_2_0/authorization/pom.xml
projects/security/security-spi/branches/Branch_2_0/identity/pom.xml
projects/security/security-spi/branches/Branch_2_0/jboss-security-spi-as4/pom.xml
projects/security/security-spi/branches/Branch_2_0/parent/pom.xml
projects/security/security-spi/branches/Branch_2_0/pom.xml
projects/security/security-spi/branches/Branch_2_0/spi/pom.xml
Log:
setting next version
Modified: projects/security/security-spi/branches/Branch_2_0/acl/pom.xml
===================================================================
--- projects/security/security-spi/branches/Branch_2_0/acl/pom.xml 2013-12-20 16:08:47 UTC (rev 114636)
+++ projects/security/security-spi/branches/Branch_2_0/acl/pom.xml 2013-12-20 17:00:18 UTC (rev 114637)
@@ -2,7 +2,7 @@
org.jboss.security
jboss-security-spi-parent
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
../parent
4.0.0
Modified: projects/security/security-spi/branches/Branch_2_0/assembly/pom.xml
===================================================================
--- projects/security/security-spi/branches/Branch_2_0/assembly/pom.xml 2013-12-20 16:08:47 UTC (rev 114636)
+++ projects/security/security-spi/branches/Branch_2_0/assembly/pom.xml 2013-12-20 17:00:18 UTC (rev 114637)
@@ -2,7 +2,7 @@
org.jboss.security
jboss-security-spi-parent
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
../parent
4.0.0
Modified: projects/security/security-spi/branches/Branch_2_0/authorization/pom.xml
===================================================================
--- projects/security/security-spi/branches/Branch_2_0/authorization/pom.xml 2013-12-20 16:08:47 UTC (rev 114636)
+++ projects/security/security-spi/branches/Branch_2_0/authorization/pom.xml 2013-12-20 17:00:18 UTC (rev 114637)
@@ -2,7 +2,7 @@
org.jboss.security
jboss-security-spi-parent
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
../parent
4.0.0
Modified: projects/security/security-spi/branches/Branch_2_0/identity/pom.xml
===================================================================
--- projects/security/security-spi/branches/Branch_2_0/identity/pom.xml 2013-12-20 16:08:47 UTC (rev 114636)
+++ projects/security/security-spi/branches/Branch_2_0/identity/pom.xml 2013-12-20 17:00:18 UTC (rev 114637)
@@ -2,7 +2,7 @@
org.jboss.security
jboss-security-spi-parent
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
../parent
4.0.0
Modified: projects/security/security-spi/branches/Branch_2_0/jboss-security-spi-as4/pom.xml
===================================================================
--- projects/security/security-spi/branches/Branch_2_0/jboss-security-spi-as4/pom.xml 2013-12-20 16:08:47 UTC (rev 114636)
+++ projects/security/security-spi/branches/Branch_2_0/jboss-security-spi-as4/pom.xml 2013-12-20 17:00:18 UTC (rev 114637)
@@ -2,7 +2,7 @@
org.jboss.security
jboss-security-spi-parent
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
../parent
4.0.0
Modified: projects/security/security-spi/branches/Branch_2_0/parent/pom.xml
===================================================================
--- projects/security/security-spi/branches/Branch_2_0/parent/pom.xml 2013-12-20 16:08:47 UTC (rev 114636)
+++ projects/security/security-spi/branches/Branch_2_0/parent/pom.xml 2013-12-20 17:00:18 UTC (rev 114637)
@@ -8,7 +8,7 @@
org.jboss.security
jboss-security-spi-parent
pom
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
JBoss Security SPI - Parent
http://labs.jboss.org/portal/jbosssecurity/
JBoss Security is a cross cutting project that handles security for the JEMS projects
Modified: projects/security/security-spi/branches/Branch_2_0/pom.xml
===================================================================
--- projects/security/security-spi/branches/Branch_2_0/pom.xml 2013-12-20 16:08:47 UTC (rev 114636)
+++ projects/security/security-spi/branches/Branch_2_0/pom.xml 2013-12-20 17:00:18 UTC (rev 114637)
@@ -2,7 +2,7 @@
org.jboss.security
jboss-security-spi-parent
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
parent
4.0.0
Modified: projects/security/security-spi/branches/Branch_2_0/spi/pom.xml
===================================================================
--- projects/security/security-spi/branches/Branch_2_0/spi/pom.xml 2013-12-20 16:08:47 UTC (rev 114636)
+++ projects/security/security-spi/branches/Branch_2_0/spi/pom.xml 2013-12-20 17:00:18 UTC (rev 114637)
@@ -2,7 +2,7 @@
org.jboss.security
jboss-security-spi-parent
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
../parent
4.0.0
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 12:01:09 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 12:01:09 -0500
Subject: [jboss-cvs] JBossAS SVN: r114638 - in
projects/security/security-jboss-sx/branches/Branch_2_0: acl
and 7 other directories.
Message-ID: <201312201701.rBKH19ag007232@svn01.web.mwc.hst.phx2.redhat.com>
Author: pskopek
Date: 2013-12-20 12:01:09 -0500 (Fri, 20 Dec 2013)
New Revision: 114638
Modified:
projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml
projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml
projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml
projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml
projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml
Log:
setting next version
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml 2013-12-20 17:00:18 UTC (rev 114637)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml 2013-12-20 17:01:09 UTC (rev 114638)
@@ -2,7 +2,7 @@
org.jboss.security
jbosssx-parent
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
../parent
4.0.0
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml 2013-12-20 17:00:18 UTC (rev 114637)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml 2013-12-20 17:01:09 UTC (rev 114638)
@@ -2,7 +2,7 @@
org.jboss.security
jbosssx-parent
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
../parent
4.0.0
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml 2013-12-20 17:00:18 UTC (rev 114637)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml 2013-12-20 17:01:09 UTC (rev 114638)
@@ -2,7 +2,7 @@
org.jboss.security
jbosssx-parent
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
../parent
4.0.0
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml 2013-12-20 17:00:18 UTC (rev 114637)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml 2013-12-20 17:01:09 UTC (rev 114638)
@@ -2,7 +2,7 @@
org.jboss.security
jbosssx-parent
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
../parent
4.0.0
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml 2013-12-20 17:00:18 UTC (rev 114637)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml 2013-12-20 17:01:09 UTC (rev 114638)
@@ -2,7 +2,7 @@
org.jboss.security
jbosssx-parent
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
../parent
4.0.0
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml 2013-12-20 17:00:18 UTC (rev 114637)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml 2013-12-20 17:01:09 UTC (rev 114638)
@@ -7,7 +7,7 @@
4.0.0
org.jboss.security
jbosssx-client
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
jar
JBoss Security Client
http://www.jboss.org
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml 2013-12-20 17:00:18 UTC (rev 114637)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml 2013-12-20 17:01:09 UTC (rev 114638)
@@ -3,7 +3,7 @@
org.jboss.security
jbosssx-parent
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
../parent
4.0.0
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml 2013-12-20 17:00:18 UTC (rev 114637)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml 2013-12-20 17:01:09 UTC (rev 114638)
@@ -8,7 +8,7 @@
org.jboss.security
jbosssx-parent
pom
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
JBossSX - Parent
http://labs.jboss.org/portal/jbosssecurity/
JBoss Security is a cross cutting project that handles security for the JEMS projects
@@ -185,6 +185,6 @@
GA
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml 2013-12-20 17:00:18 UTC (rev 114637)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml 2013-12-20 17:01:09 UTC (rev 114638)
@@ -7,7 +7,7 @@
4.0.0
org.jboss.security
jbosssx-pom
- 2.0.6.Final
+ 2.0.7-SNAPSHOT
pom
JBoss Security Implementation for the JBAS - Parent
http://labs.jboss.org/portal/jbosssecurity/
From jboss-cvs-commits at lists.jboss.org Fri Dec 20 13:46:29 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 20 Dec 2013 13:46:29 -0500
Subject: [jboss-cvs] Picketbox SVN: r487 - in
trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security:
config and 2 other directories.
Message-ID: <201312201846.rBKIkTTI017728@svn01.web.mwc.hst.phx2.redhat.com>
Author: sguilhen at redhat.com
Date: 2013-12-20 13:46:28 -0500 (Fri, 20 Dec 2013)
New Revision: 487
Modified:
trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/authorization/modules/AbstractAuthorizationModule.java
trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/SecurityConfiguration.java
trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/parser/AuthenticationConfigParser.java
trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/parser/ModuleOptionParser.java
trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/util/xml/JBossEntityResolver.java
Log:
SECURITY-777: Make static maps thread safe
Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/authorization/modules/AbstractAuthorizationModule.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/authorization/modules/AbstractAuthorizationModule.java 2013-12-17 12:05:00 UTC (rev 486)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/authorization/modules/AbstractAuthorizationModule.java 2013-12-20 18:46:28 UTC (rev 487)
@@ -24,6 +24,7 @@
import java.util.HashMap;
import java.util.Map;
import java.util.StringTokenizer;
+import java.util.concurrent.ConcurrentHashMap;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
@@ -55,10 +56,10 @@
/** Map of delegates for the various layers */
protected Map delegateMap = new HashMap();
-
+
/** A map that is available to reduce the loadClass synchronization */
- protected static Map > clazzMap = new HashMap >();
-
+ protected static Map> clazzMap = new ConcurrentHashMap>();
+
/**
* @see AuthorizationModule#authorize(Resource)
*/
Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/SecurityConfiguration.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/SecurityConfiguration.java 2013-12-17 12:05:00 UTC (rev 486)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/SecurityConfiguration.java 2013-12-20 18:46:28 UTC (rev 487)
@@ -9,6 +9,8 @@
import java.security.Key;
import java.security.spec.AlgorithmParameterSpec;
import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import org.jboss.security.PicketBoxMessages;
@@ -26,7 +28,7 @@
/**
* Map of Application Policies keyed in by name
*/
- private static HashMap appPolicies = new HashMap();
+ private static final Map appPolicies = new ConcurrentHashMap();
private static String cipherAlgorithm;
private static int iterationCount;
private static String salt;
Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/parser/AuthenticationConfigParser.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/parser/AuthenticationConfigParser.java 2013-12-17 12:05:00 UTC (rev 486)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/parser/AuthenticationConfigParser.java 2013-12-20 18:46:28 UTC (rev 487)
@@ -21,12 +21,7 @@
*/
package org.jboss.security.config.parser;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag;
@@ -69,27 +64,29 @@
public class AuthenticationConfigParser implements XMLStreamConstants
{
- public static Map loginModulesMap = new HashMap();
+ public static final Map loginModulesMap;
static
{
- loginModulesMap.put("Client", ClientLoginModule.class.getName());
- loginModulesMap.put("Certificate", BaseCertLoginModule.class.getName());
- loginModulesMap.put("CertificateRoles", CertRolesLoginModule.class.getName());
- loginModulesMap.put("DatabaseCertificate", DatabaseCertLoginModule.class.getName());
- loginModulesMap.put("Database", DatabaseServerLoginModule.class.getName());
- loginModulesMap.put("Identity", IdentityLoginModule.class.getName());
- loginModulesMap.put("Ldap", LdapLoginModule.class.getName());
- loginModulesMap.put("LdapExtended", LdapExtLoginModule.class.getName());
- loginModulesMap.put("RoleMapping", RoleMappingLoginModule.class.getName());
- loginModulesMap.put("RunAs", RunAsLoginModule.class.getName());
- loginModulesMap.put("Simple", SimpleServerLoginModule.class.getName());
- loginModulesMap.put("UsersRoles", UsersRolesLoginModule.class.getName());
- loginModulesMap.put("CallerIdentity", CallerIdentityLoginModule.class.getName());
- loginModulesMap.put("ConfiguredIdentity", ConfiguredIdentityLoginModule.class.getName());
- loginModulesMap.put("JaasSecurityDomainIdentity", JaasSecurityDomainIdentityLoginModule.class.getName());
- loginModulesMap.put("PBEIdentity", PBEIdentityLoginModule.class.getName());
- loginModulesMap.put("SecureIdentity", SecureIdentityLoginModule.class.getName());
+ final Map loginModules = new HashMap();
+ loginModules.put("Client", ClientLoginModule.class.getName());
+ loginModules.put("Certificate", BaseCertLoginModule.class.getName());
+ loginModules.put("CertificateRoles", CertRolesLoginModule.class.getName());
+ loginModules.put("DatabaseCertificate", DatabaseCertLoginModule.class.getName());
+ loginModules.put("Database", DatabaseServerLoginModule.class.getName());
+ loginModules.put("Identity", IdentityLoginModule.class.getName());
+ loginModules.put("Ldap", LdapLoginModule.class.getName());
+ loginModules.put("LdapExtended", LdapExtLoginModule.class.getName());
+ loginModules.put("RoleMapping", RoleMappingLoginModule.class.getName());
+ loginModules.put("RunAs", RunAsLoginModule.class.getName());
+ loginModules.put("Simple", SimpleServerLoginModule.class.getName());
+ loginModules.put("UsersRoles", UsersRolesLoginModule.class.getName());
+ loginModules.put("CallerIdentity", CallerIdentityLoginModule.class.getName());
+ loginModules.put("ConfiguredIdentity", ConfiguredIdentityLoginModule.class.getName());
+ loginModules.put("JaasSecurityDomainIdentity", JaasSecurityDomainIdentityLoginModule.class.getName());
+ loginModules.put("PBEIdentity", PBEIdentityLoginModule.class.getName());
+ loginModules.put("SecureIdentity", SecureIdentityLoginModule.class.getName());
+ loginModulesMap = Collections.unmodifiableMap(loginModules);
}
/**
Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/parser/ModuleOptionParser.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/parser/ModuleOptionParser.java 2013-12-17 12:05:00 UTC (rev 486)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/parser/ModuleOptionParser.java 2013-12-20 18:46:28 UTC (rev 487)
@@ -47,9 +47,9 @@
*/
public class ModuleOptionParser implements XMLStreamConstants
{
- private static transient Map parsers = new HashMap();
+ private static final Map parsers = Collections.synchronizedMap(new HashMap());
- public ModuleOptionParser()
+ static
{
parsers.put("urn:jboss:user-roles", new UsersConfigParser());
parsers.put("urn:jboss:java-properties", new JavaPropertiesConfigParser());
Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/util/xml/JBossEntityResolver.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/util/xml/JBossEntityResolver.java 2013-12-17 12:05:00 UTC (rev 486)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/util/xml/JBossEntityResolver.java 2013-12-20 18:46:28 UTC (rev 487)
@@ -56,7 +56,7 @@
public class JBossEntityResolver implements EntityResolver
{
/** A class wide Map of publicId/systemId to dtd/xsd file */
- private static Map entities = new ConcurrentHashMap ();
+ private static final Map entities = new ConcurrentHashMap ();
/** A class flag indicating whether an attempt to resolve a systemID as a
non-file URL should produce a warning rather than a trace level log msg.
*/
From jboss-cvs-commits at lists.jboss.org Mon Dec 23 02:16:25 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Mon, 23 Dec 2013 02:16:25 -0500
Subject: [jboss-cvs] JBossAS SVN: r114639 -
branches/JBPAPP_5/component-matrix.
Message-ID: <201312230716.rBN7GPVR009429@svn01.web.mwc.hst.phx2.redhat.com>
Author: huwang
Date: 2013-12-23 02:16:24 -0500 (Mon, 23 Dec 2013)
New Revision: 114639
Modified:
branches/JBPAPP_5/component-matrix/pom.xml
Log:
JBPAPP-10932 Upgrade Hibernate ORM for EAP 5.3
Modified: branches/JBPAPP_5/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5/component-matrix/pom.xml 2013-12-20 17:01:09 UTC (rev 114638)
+++ branches/JBPAPP_5/component-matrix/pom.xml 2013-12-23 07:16:24 UTC (rev 114639)
@@ -50,12 +50,12 @@
2.1.13.GA-patch-02
2.6.22.Final
3.8.2
- 3.4.0.GA_CP05
+ 3.4.0.GA_CP06
3.1.0.GA
1.0.2.GA
- 3.4.0.GA_CP05
+ 3.4.0.GA_CP06
3.1.0.GA
- 3.3.2.GA_CP05
+ 3.3.2.GA_CP06
2.1.6.GA_CP06
1.0.1
1.0.3
From jboss-cvs-commits at lists.jboss.org Mon Dec 23 11:12:44 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Mon, 23 Dec 2013 11:12:44 -0500
Subject: [jboss-cvs] Picketbox SVN: r488 -
trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi.
Message-ID: <201312231612.rBNGCisi021490@svn01.web.mwc.hst.phx2.redhat.com>
Author: sguilhen at redhat.com
Date: 2013-12-23 11:12:44 -0500 (Mon, 23 Dec 2013)
New Revision: 488
Modified:
trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/AbstractServerLoginModule.java
Log:
SECURITY-769 Port changes applied to picketbox-container
Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/AbstractServerLoginModule.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/AbstractServerLoginModule.java 2013-12-20 18:46:28 UTC (rev 487)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/AbstractServerLoginModule.java 2013-12-23 16:12:44 UTC (rev 488)
@@ -392,11 +392,11 @@
*/
protected void addValidOptions(final String[] moduleValidOptions)
{
- if (validOptions==null)
- {
- validOptions = new HashSet();
- }
- validOptions.addAll(Arrays.asList(moduleValidOptions));
+ if (validOptions == null)
+ {
+ validOptions = new HashSet(moduleValidOptions.length);
+ }
+ validOptions.addAll(Arrays.asList(moduleValidOptions));
}
/**
@@ -413,4 +413,4 @@
}
}
}
-}
\ No newline at end of file
+}
From jboss-cvs-commits at lists.jboss.org Tue Dec 24 03:09:07 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Tue, 24 Dec 2013 03:09:07 -0500
Subject: [jboss-cvs] JBossAS SVN: r114640 -
branches/JBPAPP_5/component-matrix.
Message-ID: <201312240809.rBO897KA025265@svn01.web.mwc.hst.phx2.redhat.com>
Author: huwang
Date: 2013-12-24 03:09:07 -0500 (Tue, 24 Dec 2013)
New Revision: 114640
Modified:
branches/JBPAPP_5/component-matrix/pom.xml
Log:
JBPAPP-10444 Upgrade JBoss Microcontainer to 2.0.11.GA
Modified: branches/JBPAPP_5/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5/component-matrix/pom.xml 2013-12-23 07:16:24 UTC (rev 114639)
+++ branches/JBPAPP_5/component-matrix/pom.xml 2013-12-24 08:09:07 UTC (rev 114640)
@@ -82,7 +82,7 @@
2.1.1.SP2
2.0.3.GA
1.0.7.GA
- 2.0.10.GA
+ 2.0.11.GA
5.0.3.GA_CP02
2.0.4.GA
2.5.4.SP4_patch01
From jboss-cvs-commits at lists.jboss.org Tue Dec 24 12:07:50 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Tue, 24 Dec 2013 12:07:50 -0500
Subject: [jboss-cvs] JBossAS SVN: r114641 -
branches/JBPAPP_5/component-matrix.
Message-ID: <201312241707.rBOH7oPD003795@svn01.web.mwc.hst.phx2.redhat.com>
Author: huwang
Date: 2013-12-24 12:07:49 -0500 (Tue, 24 Dec 2013)
New Revision: 114641
Modified:
branches/JBPAPP_5/component-matrix/pom.xml
Log:
JBPAPP-10897 Upgrade JBoss Security to 2.0.6
Modified: branches/JBPAPP_5/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5/component-matrix/pom.xml 2013-12-24 08:09:07 UTC (rev 114640)
+++ branches/JBPAPP_5/component-matrix/pom.xml 2013-12-24 17:07:49 UTC (rev 114641)
@@ -86,8 +86,8 @@
5.0.3.GA_CP02
2.0.4.GA
2.5.4.SP4_patch01
- 2.0.5.SP3-1-patch-01
- 2.0.5.SP3-1
+ 2.0.6.Final
+ 2.0.6.Final
2.1.4.GA
1.0.6.FINAL
1.0.2.GA_CP03
From jboss-cvs-commits at lists.jboss.org Wed Dec 25 13:29:23 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Wed, 25 Dec 2013 13:29:23 -0500
Subject: [jboss-cvs] JBossAS SVN: r114642 -
branches/JBPAPP_5/component-matrix.
Message-ID: <201312251829.rBPITNUg020190@svn01.web.mwc.hst.phx2.redhat.com>
Author: huwang
Date: 2013-12-25 13:29:22 -0500 (Wed, 25 Dec 2013)
New Revision: 114642
Modified:
branches/JBPAPP_5/component-matrix/pom.xml
Log:
JBPAPP-10435 Release and upgrade JBossWS-Native for EAP 5.3.0
Modified: branches/JBPAPP_5/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5/component-matrix/pom.xml 2013-12-24 17:07:49 UTC (rev 114641)
+++ branches/JBPAPP_5/component-matrix/pom.xml 2013-12-25 18:29:22 UTC (rev 114642)
@@ -40,10 +40,10 @@
1.0-MR1
2.0.1
4.6.1.GA_CP13
- 1.1.0.SP10
- 3.1.2.SP13
+ 1.1.0.SP11
+ 3.1.2.SP14
1.1.2.SP8
- 3.1.2.SP15-patch-02
+ 3.1.2.SP16
1.0.1.GA
1.4.8.SP9_patch_01
2.2.24.EAP.GA
From jboss-cvs-commits at lists.jboss.org Fri Dec 27 13:58:16 2013
From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org)
Date: Fri, 27 Dec 2013 13:58:16 -0500
Subject: [jboss-cvs] JBossAS SVN: r114643 -
branches/JBPAPP_5/component-matrix.
Message-ID: <201312271858.rBRIwG16002211@svn01.web.mwc.hst.phx2.redhat.com>
Author: huwang
Date: 2013-12-27 13:58:15 -0500 (Fri, 27 Dec 2013)
New Revision: 114643
Modified:
branches/JBPAPP_5/component-matrix/pom.xml
Log:
JBPAPP-10670 Upgrade JacORB to 2.3.2-jboss-5
Modified: branches/JBPAPP_5/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5/component-matrix/pom.xml 2013-12-25 18:29:22 UTC (rev 114642)
+++ branches/JBPAPP_5/component-matrix/pom.xml 2013-12-27 18:58:15 UTC (rev 114643)
@@ -31,9 +31,9 @@
2.7.1-patch-06
- 2.3.2-jboss-1
- 2.3.2-jboss-1
- 2.3.2-jboss-1
+ 2.3.2-jboss-5
+ 2.3.2-jboss-5
+ 2.3.2-jboss-5
1.2_13-patch-01
1.0.0.Final
2.1