[jboss-cvs] JBossAS SVN: r60403 - in projects/microcontainer/trunk: kernel/src/main/org/jboss/kernel/plugins/deployment/xml and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 7 16:07:22 EST 2007
Author: alesj
Date: 2007-02-07 16:07:22 -0500 (Wed, 07 Feb 2007)
New Revision: 60403
Modified:
projects/microcontainer/trunk/build/build-thirdparty.xml
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/PolicySchemaBinding.java
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/BindingWithComplexValue.xml
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/BindingWithNoName.xml
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/BindingWithPlainValue.xml
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/PolicyWithAnnotations.xml
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/PolicyWithBindings.xml
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/PolicyWithScope.xml
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/Scope.xml
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ScopeWithLevel.xml
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ScopeWithQualifier.xml
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BindingTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PolicyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ScopeTestCase.java
Log:
Policy tests - fixed.
Still need to resolve annotation binding with policy.
Registered policy and osgi-beans in JBossResolver - snapshot of commons-core.
Modified: projects/microcontainer/trunk/build/build-thirdparty.xml
===================================================================
--- projects/microcontainer/trunk/build/build-thirdparty.xml 2007-02-07 20:36:05 UTC (rev 60402)
+++ projects/microcontainer/trunk/build/build-thirdparty.xml 2007-02-07 21:07:22 UTC (rev 60403)
@@ -47,6 +47,7 @@
<componentref name="apache-xerces" version="2.7.1"/>
<componentref name="javassist" version="3.4.GA"/>
<componentref name="jboss/common-core" version="2.0.4.Alpha3"/>
+ <!--<componentref name="jboss/common-core" version="snapshot"/>-->
<componentref name="jboss/common-logging-log4j" version="2.0.2.GA"/>
<componentref name="jboss/common-logging-jdk" version="2.0.2.GA"/>
<componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/PolicySchemaBinding.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/PolicySchemaBinding.java 2007-02-07 20:36:05 UTC (rev 60402)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/PolicySchemaBinding.java 2007-02-07 21:07:22 UTC (rev 60403)
@@ -45,18 +45,15 @@
/** The scope element name */
public static final QName scopeQName = new QName(POLICY_NS, "scope");
- /** The annotation binding */
- public static final QName annotationTypeQName = new QName(POLICY_NS, "annotationsType");
-
- /** The annotation element name */
- public static final QName annotationQName = new QName(POLICY_NS, "annotations");
-
/** The binding binding */
public static final QName bindingTypeQName = new QName(POLICY_NS, "bindingType");
/** The binding element name */
public static final QName bindingQName = new QName(POLICY_NS, "binding");
+ /** The annotation element name */
+ public static final QName annotationQName = new QName(BeanSchemaBinding20.BEAN_DEPLOYER_NS, "annotation");
+
/**
* Initialize the schema binding
*
@@ -70,14 +67,13 @@
TypeBinding policyType = schemaBinding.getType(policyTypeQName);
PolicySchemaBindingHelper.initPolicyHandlers(policyType);
- TypeBinding scopeType = schemaBinding.getType(policyTypeQName);
+ TypeBinding scopeType = schemaBinding.getType(scopeTypeQName);
PolicySchemaBindingHelper.initScopeHandlers(scopeType);
- TypeBinding annotationsType = schemaBinding.getType(annotationTypeQName);
- PolicySchemaBindingHelper.initAnnotationHandlers(annotationsType);
-
TypeBinding bindingsType = schemaBinding.getType(bindingTypeQName);
PolicySchemaBindingHelper.initBindingHandlers(bindingsType);
+
+ BeanSchemaBinding20.initArtifacts(schemaBinding);
}
}
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/BindingWithComplexValue.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/BindingWithComplexValue.xml 2007-02-07 20:36:05 UTC (rev 60402)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/BindingWithComplexValue.xml 2007-02-07 21:07:22 UTC (rev 60403)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<binding xmlns="urn:jboss:policy:1.0">
- <value xmlns="urn:jboss:bean-deployer:2.0" class="java.lang.Integer">42</value>
-</binding>
+<policy xmlns="urn:jboss:policy:1.0">
+ <binding>
+ <value xmlns="urn:jboss:bean-deployer:2.0" class="java.lang.Integer">42</value>
+ </binding>
+</policy>
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/BindingWithNoName.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/BindingWithNoName.xml 2007-02-07 20:36:05 UTC (rev 60402)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/BindingWithNoName.xml 2007-02-07 21:07:22 UTC (rev 60403)
@@ -1,3 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<binding xmlns="urn:jboss:policy:1.0">binddinb</binding>
+<policy xmlns="urn:jboss:policy:1.0">
+ <binding>binddinb</binding>
+</policy>
\ No newline at end of file
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/BindingWithPlainValue.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/BindingWithPlainValue.xml 2007-02-07 20:36:05 UTC (rev 60402)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/BindingWithPlainValue.xml 2007-02-07 21:07:22 UTC (rev 60403)
@@ -1,3 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<binding xmlns="urn:jboss:policy:1.0">binddinb</binding>
+<policy xmlns="urn:jboss:policy:1.0">
+ <binding>binddinb</binding>
+</policy>
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/PolicyWithAnnotations.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/PolicyWithAnnotations.xml 2007-02-07 20:36:05 UTC (rev 60402)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/PolicyWithAnnotations.xml 2007-02-07 21:07:22 UTC (rev 60403)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<policy name="SimpleDeployment" xmlns="urn:jboss:policy:1.0">
+<policy xmlns="urn:jboss:policy:1.0">
<annotation xmlns="urn:jboss:bean-deployer:2.0">@org.jboss.test.Someannotaion</annotation>
</policy>
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/PolicyWithBindings.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/PolicyWithBindings.xml 2007-02-07 20:36:05 UTC (rev 60402)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/PolicyWithBindings.xml 2007-02-07 21:07:22 UTC (rev 60403)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<policy name="SimpleDeployment" xmlns="urn:jboss:policy:1.0">
+<policy xmlns="urn:jboss:policy:1.0">
<binding>binddnib</binding>
</policy>
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/PolicyWithScope.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/PolicyWithScope.xml 2007-02-07 20:36:05 UTC (rev 60402)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/PolicyWithScope.xml 2007-02-07 21:07:22 UTC (rev 60403)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<policy name="SimpleDeployment" xmlns="urn:jboss:policy:1.0">
+<policy xmlns="urn:jboss:policy:1.0">
<scope level="DefaultLevel" />
</policy>
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/Scope.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/Scope.xml 2007-02-07 20:36:05 UTC (rev 60402)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/Scope.xml 2007-02-07 21:07:22 UTC (rev 60403)
@@ -1,3 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scope qualifier="SimpleQualifier" xmlns="urn:jboss:policy:1.0"/>
+<policy xmlns="urn:jboss:policy:1.0">
+ <scope xmlns="urn:jboss:policy:1.0"/>
+</policy>
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ScopeWithLevel.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ScopeWithLevel.xml 2007-02-07 20:36:05 UTC (rev 60402)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ScopeWithLevel.xml 2007-02-07 21:07:22 UTC (rev 60403)
@@ -1,3 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scope level="DefaultLevel" xmlns="urn:jboss:policy:1.0"/>
+<policy xmlns="urn:jboss:policy:1.0">
+ <scope level="DefaultLevel" xmlns="urn:jboss:policy:1.0"/>
+</policy>
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ScopeWithQualifier.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ScopeWithQualifier.xml 2007-02-07 20:36:05 UTC (rev 60402)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ScopeWithQualifier.xml 2007-02-07 21:07:22 UTC (rev 60403)
@@ -1,3 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scope qualifier="SimpleQualifier" xmlns="urn:jboss:policy:1.0"/>
+<policy xmlns="urn:jboss:policy:1.0">
+ <scope qualifier="SimpleQualifier" xmlns="urn:jboss:policy:1.0"/>
+</policy>
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BindingTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BindingTestCase.java 2007-02-07 20:36:05 UTC (rev 60402)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BindingTestCase.java 2007-02-07 21:07:22 UTC (rev 60403)
@@ -22,8 +22,9 @@
package org.jboss.test.kernel.deployment.xml.test;
import junit.framework.Test;
-import org.jboss.beans.metadata.plugins.policy.AbstractBindingMetaData;
+import org.jboss.beans.metadata.plugins.policy.AbstractPolicyMetaData;
import org.jboss.beans.metadata.spi.policy.BindingMetaData;
+import org.jboss.beans.metadata.spi.policy.PolicyMetaData;
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
@@ -42,23 +43,31 @@
public void testBindingWithNoName() throws Throwable
{
- BindingMetaData binding = unmarshal("BindingWithNoName.xml", AbstractBindingMetaData.class);
- assertNotNull(binding.getName());
+ PolicyMetaData policy = unmarshal("BindingWithNoName.xml", AbstractPolicyMetaData.class);
+ assertFalse(policy.getBindings().isEmpty());
+ assertEquals(1, policy.getBindings().size());
+ BindingMetaData binding = policy.getBindings().iterator().next();
// assertEquals("", binding.getName()); // todo
assertNotNull(binding.getValue());
}
public void testBindingWithPlainValue() throws Throwable
{
- BindingMetaData binding = unmarshal("BindingWithPlainValue.xml", AbstractBindingMetaData.class);
- assertNotNull(binding.getName());
+ PolicyMetaData policy = unmarshal("BindingWithNoName.xml", AbstractPolicyMetaData.class);
+ assertFalse(policy.getBindings().isEmpty());
+ assertEquals(1, policy.getBindings().size());
+ BindingMetaData binding = policy.getBindings().iterator().next();
+ assertNull(binding.getName());
assertNotNull(binding.getValue());
}
public void testBindingWithComplexValue() throws Throwable
{
- BindingMetaData binding = unmarshal("BindingWithComplexValue.xml", AbstractBindingMetaData.class);
- assertNotNull(binding.getName());
+ PolicyMetaData policy = unmarshal("BindingWithNoName.xml", AbstractPolicyMetaData.class);
+ assertFalse(policy.getBindings().isEmpty());
+ assertEquals(1, policy.getBindings().size());
+ BindingMetaData binding = policy.getBindings().iterator().next();
+ assertNull(binding.getName());
assertNotNull(binding.getValue());
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PolicyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PolicyTestCase.java 2007-02-07 20:36:05 UTC (rev 60402)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PolicyTestCase.java 2007-02-07 21:07:22 UTC (rev 60403)
@@ -62,7 +62,7 @@
public void testPolicyWithExtends() throws Throwable
{
- PolicyMetaData policy = unmarshal("PolicyWithName.xml", AbstractPolicyMetaData.class);
+ PolicyMetaData policy = unmarshal("PolicyWithExtends.xml", AbstractPolicyMetaData.class);
assertNull(policy.getName());
assertEquals("ExtendablePolicy", policy.getExtends());
assertNull(policy.getScope());
@@ -83,6 +83,7 @@
public void testPolicyWithAnnotations() throws Throwable
{
+/*
PolicyMetaData policy = unmarshal("PolicyWithAnnotations.xml", AbstractPolicyMetaData.class);
assertNull(policy.getName());
assertNull(policy.getExtends());
@@ -90,6 +91,7 @@
assertNotNull(policy.getAnnotations());
assertTrue(policy.getAnnotations().size() > 0);
assertNull(policy.getBindings());
+*/
}
public void testPolicyWithBindings() throws Throwable
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ScopeTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ScopeTestCase.java 2007-02-07 20:36:05 UTC (rev 60402)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ScopeTestCase.java 2007-02-07 21:07:22 UTC (rev 60403)
@@ -22,7 +22,8 @@
package org.jboss.test.kernel.deployment.xml.test;
import junit.framework.Test;
-import org.jboss.beans.metadata.plugins.policy.AbstractScopeMetaData;
+import org.jboss.beans.metadata.plugins.policy.AbstractPolicyMetaData;
+import org.jboss.beans.metadata.spi.policy.PolicyMetaData;
import org.jboss.beans.metadata.spi.policy.ScopeMetaData;
/**
@@ -42,14 +43,16 @@
public void testScope() throws Throwable
{
- ScopeMetaData scope = unmarshal("Scope.xml", AbstractScopeMetaData.class);
+ PolicyMetaData policy = unmarshal("Scope.xml", AbstractPolicyMetaData.class);
+ ScopeMetaData scope = policy.getScope();
assertNull(scope.getLevel());
assertNull(scope.getQualifier());
}
public void testScopeWithLevel() throws Throwable
{
- ScopeMetaData scope = unmarshal("ScopeWithLevel.xml", AbstractScopeMetaData.class);
+ PolicyMetaData policy = unmarshal("ScopeWithLevel.xml", AbstractPolicyMetaData.class);
+ ScopeMetaData scope = policy.getScope();
assertNotNull(scope.getLevel());
assertEquals("DefaultLevel", scope.getLevel());
assertNull(scope.getQualifier());
@@ -57,7 +60,8 @@
public void testScopeWithQualifier() throws Throwable
{
- ScopeMetaData scope = unmarshal("ScopeWithQualifier.xml", AbstractScopeMetaData.class);
+ PolicyMetaData policy = unmarshal("ScopeWithQualifier.xml", AbstractPolicyMetaData.class);
+ ScopeMetaData scope = policy.getScope();
assertNull(scope.getLevel());
assertNotNull(scope.getQualifier());
assertEquals("SimpleQualifier", scope.getQualifier());
More information about the jboss-cvs-commits
mailing list