[jboss-cvs] JBossAS SVN: r104106 - in branches/KABIR_JAVASSIST_REFLECT: connector/src/main/java/org/jboss/resource/deployers and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 21 04:23:39 EDT 2010
Author: kabir.khan at jboss.com
Date: 2010-04-21 04:23:38 -0400 (Wed, 21 Apr 2010)
New Revision: 104106
Modified:
branches/KABIR_JAVASSIST_REFLECT/
branches/KABIR_JAVASSIST_REFLECT/README.txt
branches/KABIR_JAVASSIST_REFLECT/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
branches/KABIR_JAVASSIST_REFLECT/profileservice/src/main/java/org/jboss/profileservice/management/ManagementViewImpl.java
branches/KABIR_JAVASSIST_REFLECT/server/src/main/java/org/jboss/ejb/EjbModule.java
branches/KABIR_JAVASSIST_REFLECT/system/src/main/java/org/jboss/system/deployers/LegacyDeploymentContextComparator.java
branches/KABIR_JAVASSIST_REFLECT/testsuite/build.xml
Log:
Merged revisions 104065,104075,104080-104081,104083,104086 via svnmerge from
https://svn.jboss.org/repos/jbossas/trunk
.......
r104065 | mmoyses | 2010-04-16 19:59:56 +0100 (Fri, 16 Apr 2010) | 1 line
JBAS-7951: fix warning for unsecured MDBs
.......
r104075 | jason.greene at jboss.com | 2010-04-17 05:47:38 +0100 (Sat, 17 Apr 2010) | 2 lines
Add skip.report property
.......
r104080 | emuckenhuber | 2010-04-20 16:13:57 +0100 (Tue, 20 Apr 2010) | 1 line
remove managed object creator
.......
r104081 | emuckenhuber | 2010-04-20 16:14:47 +0100 (Tue, 20 Apr 2010) | 1 line
move predetermined MC out of the MO processing
.......
r104083 | alesj | 2010-04-20 16:44:51 +0100 (Tue, 20 Apr 2010) | 1 line
[JBAS-7614]; fix order map creation.
.......
r104086 | dimitris at jboss.org | 2010-04-20 16:54:19 +0100 (Tue, 20 Apr 2010) | 1 line
test commit
.......
Property changes on: branches/KABIR_JAVASSIST_REFLECT
___________________________________________________________________
Name: svnmerge-integrated
- /trunk:1-104061
+ /trunk:1-104105
Modified: branches/KABIR_JAVASSIST_REFLECT/README.txt
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/README.txt 2010-04-21 00:59:13 UTC (rev 104105)
+++ branches/KABIR_JAVASSIST_REFLECT/README.txt 2010-04-21 08:23:38 UTC (rev 104106)
@@ -7,7 +7,7 @@
component-matrix - Contains Maven configuration which controls dependency versions.
testsuite - Contains code and build scripts for testing the application server
thirdparty - Used during the build process
-tools - Various files used by the build (ant, maven, etc)
+tools - Various files used by the build (ant, maven, etc.)
The remaining directories contain the various components of the application server.
Modified: branches/KABIR_JAVASSIST_REFLECT/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java 2010-04-21 00:59:13 UTC (rev 104105)
+++ branches/KABIR_JAVASSIST_REFLECT/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java 2010-04-21 08:23:38 UTC (rev 104106)
@@ -22,20 +22,14 @@
package org.jboss.resource.deployers;
import java.io.InputStream;
-import java.util.Map;
-import java.util.Set;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.Unmarshaller;
import javax.xml.transform.sax.SAXSource;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.managed.api.ManagedObject;
import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup;
import org.jboss.resource.metadata.repository.JCAMetaDataRepository;
import org.jboss.util.xml.JBossEntityResolver;
@@ -54,7 +48,6 @@
* TODO Note, this is currently a total hack until we can rework the JAXBDeployer
*/
public class ManagedConnectionFactoryParserDeployer extends AbstractVFSParsingDeployer<ManagedConnectionFactoryDeploymentGroup>
- implements ManagedObjectCreator
{
/** The context */
private JAXBContext context;
@@ -131,19 +124,4 @@
metaData.setUrl(file.toURL());
}
- /**
- * Build managed object.
- *
- * @param unit the deployment unit
- * @param managedObjects map of managed objects
- * @throws DeploymentException for any deployment exception
- */
- public void build(DeploymentUnit unit, Set<String> outputs,
- Map<String, ManagedObject> managedObjects) throws DeploymentException
- {
- if(isBuildManagedObject())
- {
- // Don't duplicate MOs
- }
- }
}
Modified: branches/KABIR_JAVASSIST_REFLECT/profileservice/src/main/java/org/jboss/profileservice/management/ManagementViewImpl.java
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/profileservice/src/main/java/org/jboss/profileservice/management/ManagementViewImpl.java 2010-04-21 00:59:13 UTC (rev 104105)
+++ branches/KABIR_JAVASSIST_REFLECT/profileservice/src/main/java/org/jboss/profileservice/management/ManagementViewImpl.java 2010-04-21 08:23:38 UTC (rev 104106)
@@ -620,6 +620,19 @@
if(state != null && md instanceof ManagedDeploymentImpl)
((ManagedDeploymentImpl)md).setDeploymentState(state);
+ // Map any existing ManagedComponent types
+ for(ManagedComponent comp : md.getComponents().values())
+ {
+ ComponentType type = comp.getType();
+ Set<ManagedComponent> typeComps = compByCompType.get(type);
+ if (typeComps == null)
+ {
+ typeComps = new HashSet<ManagedComponent>();
+ compByCompType.put(type, typeComps);
+ }
+ typeComps.add(comp);
+ }
+
for(ManagedObject mo : mos.values())
{
processManagedObject(mo, md);
@@ -732,20 +745,6 @@
// Check for unresolved refs
checkForReferences(key, mo);
- // Map any existing ManagedComponent types
- for(ManagedComponent comp : md.getComponents().values())
- {
- log.debug("Updating ManagementComponent: "+comp);
- ComponentType type = comp.getType();
- Set<ManagedComponent> typeComps = compByCompType.get(type);
- if (typeComps == null)
- {
- typeComps = new HashSet<ManagedComponent>();
- compByCompType.put(type, typeComps);
- }
- typeComps.add(comp);
- }
-
// Create ManagedComponents for ManagedObjects annotated with ManagementComponent
ManagementComponent mc = (ManagementComponent) moAnns.get(ManagementComponent.class.getName());
if (mc != null && md.getComponent(mo.getName()) == null)
Modified: branches/KABIR_JAVASSIST_REFLECT/server/src/main/java/org/jboss/ejb/EjbModule.java
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/server/src/main/java/org/jboss/ejb/EjbModule.java 2010-04-21 00:59:13 UTC (rev 104105)
+++ branches/KABIR_JAVASSIST_REFLECT/server/src/main/java/org/jboss/ejb/EjbModule.java 2010-04-21 08:23:38 UTC (rev 104106)
@@ -831,7 +831,8 @@
// Set security domain manager
String securityDomain = bean.getApplicationMetaData().getSecurityDomain();
// JBAS-5960: Set default security domain if there is security metadata
- if (securityDomain == null && hasSecurityMetaData(bean))
+ boolean hasSecurityMetaData = hasSecurityMetaData(bean);
+ if (securityDomain == null && hasSecurityMetaData)
{
securityDomain = SecurityConstants.DEFAULT_EJB_APPLICATION_POLICY;
}
@@ -877,8 +878,9 @@
}
else
{
- log.warn("EJB configured to bypass security. Please verify if this is intended. Bean=" + bean.getEjbName()
- + " Deployment=" + unit.getName());
+ if ("".equals(securityDomain) && hasSecurityMetaData)
+ log.warn("EJB configured to bypass security. Please verify if this is intended. Bean=" + bean.getEjbName()
+ + " Deployment=" + unit.getName());
}
// Load the security proxy instance if one was configured
Modified: branches/KABIR_JAVASSIST_REFLECT/system/src/main/java/org/jboss/system/deployers/LegacyDeploymentContextComparator.java
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/system/src/main/java/org/jboss/system/deployers/LegacyDeploymentContextComparator.java 2010-04-21 00:59:13 UTC (rev 104105)
+++ branches/KABIR_JAVASSIST_REFLECT/system/src/main/java/org/jboss/system/deployers/LegacyDeploymentContextComparator.java 2010-04-21 08:23:38 UTC (rev 104106)
@@ -31,8 +31,6 @@
* Legacy deployment sorter
*
* @author ales.justin at jboss.org
- * @see org.jboss.deployment.DeploymentSorter in system-jmx
- * @see org.jboss.deployment.SuffixOrderHelper in system-jmx
*/
public class LegacyDeploymentContextComparator extends DefaultDeploymentContextComparator
{
@@ -68,6 +66,7 @@
private boolean useDefaults = true;
private Map<String, Integer> suffixOrder;
+ private Map<String, Integer> orderMap;
private int defaultOrder = 850;
/**
@@ -100,7 +99,7 @@
protected int getContextOrder(DeploymentContext context)
{
String simpleName = context.getSimpleName();
- for (Map.Entry<String, Integer> entry : suffixOrder.entrySet())
+ for (Map.Entry<String, Integer> entry : getOrderMap().entrySet())
{
if (simpleName.endsWith(entry.getKey()))
return entry.getValue();
@@ -108,14 +107,35 @@
return defaultOrder;
}
+ protected Map<String, Integer> getOrderMap()
+ {
+ if (orderMap == null)
+ orderMap = createOrderMap();
+
+ return orderMap;
+ }
+
public void create()
{
+ // do nothing -- back compatibility purpose only
+ }
+
+ /**
+ * Create order map.
+ *
+ * Legacy mappings first,
+ * then override it with custom suffix order.
+ *
+ * @return the new order map
+ */
+ public Map<String, Integer> createOrderMap()
+ {
Map<String, Integer> map = new HashMap<String, Integer>();
if (useDefaults)
map.putAll(legacyOrder);
if (suffixOrder != null)
map.putAll(suffixOrder);
- suffixOrder = map;
+ return map;
}
/**
Modified: branches/KABIR_JAVASSIST_REFLECT/testsuite/build.xml
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/testsuite/build.xml 2010-04-21 00:59:13 UTC (rev 104105)
+++ branches/KABIR_JAVASSIST_REFLECT/testsuite/build.xml 2010-04-21 08:23:38 UTC (rev 104106)
@@ -3887,7 +3887,7 @@
<delete dir="${build.reports}"/>
</target>
- <target name="tests-report" depends="tests-report-html, tests-report-text, tests-report-xml">
+ <target name="tests-report" depends="tests-report-html, tests-report-text, tests-report-xml" unless="skip.report">
<tar tarfile="${module.output}/${TIMENOW}.tgz" compression="gzip" longfile="gnu">
<tarfileset dir="${build.reports}/html" prefix="${TIMENOW}">
<include name="**"/>
@@ -3895,7 +3895,7 @@
</tar>
</target>
- <target name="tests-report-html" depends="compile-stylesheets">
+ <target name="tests-report-html" depends="compile-stylesheets" unless="skip.report">
<mkdir dir="${build.reports}/html"/>
<mkdir dir="${aspects.root}/output/reports"/>
@@ -3918,7 +3918,7 @@
| off by default. Once this is fixed, it should be built after
| tests-report-html
-->
- <target name="tests-report-text" depends="tests-report-html">
+ <target name="tests-report-text" depends="tests-report-html" unless="skip.report">
<mkdir dir="${build.reports}/text"/>
<style basedir="${build.reports}"
@@ -3943,7 +3943,7 @@
</style>
</target>
- <target name="tests-report-xml" depends="tests-report-html">
+ <target name="tests-report-xml" depends="tests-report-html" unless="skip.report">
<mkdir dir="${build.reports}/xml"/>
<style basedir="${build.reports}"
More information about the jboss-cvs-commits
mailing list