You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/04/09 19:58:37 UTC
svn commit: r932533 - in /geronimo/server/trunk: ./ plugins/corba/
plugins/corba/client-corba-yoko/
plugins/corba/client-corba-yoko/src/main/history/
plugins/corba/client-corba-yoko/src/main/plan/
plugins/corba/geronimo-corba-builder/ plugins/corba/ger...
Author: djencks
Date: Fri Apr 9 17:58:36 2010
New Revision: 932533
URL: http://svn.apache.org/viewvc?rev=932533&view=rev
Log:
GERONIMO-5092 fix split packages, update things a bit for osgi
Added:
geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/
geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/
geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/css/
geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/css/CSSConfigEditor.java
- copied, changed from r931738, geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/css/CSSConfigEditor.java
geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/tss/
geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/tss/TSSConfigEditor.java
- copied, changed from r931738, geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSConfigEditor.java
Removed:
geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/css/CSSConfigEditor.java
geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSConfigEditor.java
Modified:
geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml
geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/plan/plan.xml
geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml
geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java
geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/test/java/org/apache/geronimo/corba/security/config/tss/TSSConfigEditorTest.java
geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml
geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/StandardServant.java
geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java
geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml
geronimo/server/trunk/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java
geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/TSSConfigEditorTest.java
geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/plan/plan.xml
geronimo/server/trunk/plugins/corba/pom.xml
geronimo/server/trunk/plugins/openejb/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml?rev=932533&r1=932532&r2=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml Fri Apr 9 17:58:36 2010
@@ -143,8 +143,8 @@
</dependency>
<dependency>
- <groupId>org.apache.bcel</groupId>
- <artifactId>bcel</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.bcel</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml?rev=932533&r1=932532&r2=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml Fri Apr 9 17:58:36 2010
@@ -32,6 +32,11 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.bcel</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-core</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/plan/plan.xml?rev=932533&r1=932532&r2=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/plan/plan.xml Fri Apr 9 17:58:36 2010
@@ -33,7 +33,7 @@
<gbean name="DyanmicStubClassLoader" class="org.apache.geronimo.corba.util.DynamicStubClassLoaderGBean"/>
- <gbean name="ORBConfigAdapter" class="org.apache.geronimo.yoko.ORBConfigAdapterGBean"/>
+ <gbean name="ORBConfigAdapter" class="org.apache.geronimo.yoko.ORBConfigAdapter"/>
<gbean name="NameServerRef" class="org.apache.geronimo.corba.NameServiceGBean">
<reference name="ServerInfo">
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml?rev=932533&r1=932532&r2=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml Fri Apr 9 17:58:36 2010
@@ -54,33 +54,33 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>xmlbeans-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+ <Import-Package>
+ org.w3.xml.x1998.namespace.impl,
+ org.w3.xml.x1998.namespace,
+ org.apache.xmlbeans.impl.schema;version="2.4",
+ *
+ </Import-Package>
+ <Export-Package>
+ org.apache.geronimo.corba.deployment,
+ org.apache.geronimo.corba.deployment.security.config.css,
+ org.apache.geronimo.corba.deployment.security.config.tss,
+ org.apache.geronimo.corba.xbeans.csiv2.tss,
+ org.apache.geronimo.corba.xbeans.csiv2.tss.impl,
+ org.apache.geronimo.corba.xbeans.csiv2.css,
+ org.apache.geronimo.corba.xbeans.csiv2.css.impl
+ </Export-Package>
+ <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
+ <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
- <Import-Package>
- org.w3.xml.x1998.namespace.impl,
- org.w3.xml.x1998.namespace,
- org.apache.xmlbeans.impl.schema;version="2.4",
- *
- </Import-Package>
- <Export-Package>
- org.apache.geronimo.corba.deployment,
- org.apache.geronimo.corba.security.config.css,
- org.apache.geronimo.corba.security.config.tss,
- org.apache.geronimo.corba.xbeans.csiv2.tss,
- org.apache.geronimo.corba.xbeans.csiv2.tss.impl,
- org.apache.geronimo.corba.xbeans.csiv2.css,
- org.apache.geronimo.corba.xbeans.csiv2.css.impl
- </Export-Package>
- <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
- <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
- </instructions>
- </configuration>
- </plugin>
</build>
</project>
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java?rev=932533&r1=932532&r2=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java Fri Apr 9 17:58:36 2010
@@ -16,20 +16,19 @@
*/
package org.apache.geronimo.corba.deployment;
+import java.net.URI;
+import java.net.URL;
import java.util.Collection;
-import java.util.Map;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.jar.JarFile;
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.corba.TSSLinkGBean;
import org.apache.geronimo.deployment.ModuleIDBuilder;
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.deployment.service.EnvironmentBuilder;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanData;
@@ -39,24 +38,21 @@ import org.apache.geronimo.gbean.GBeanLi
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.Module;
import org.apache.geronimo.j2ee.deployment.ModuleBuilderExtension;
-import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
import org.apache.geronimo.kernel.GBeanNotFoundException;
-import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.Naming;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
import org.apache.geronimo.openejb.deployment.EjbModule;
-import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
-
-import org.apache.openejb.jee.oejb2.GeronimoEjbJarType;
-import org.apache.openejb.jee.oejb2.TssLinkType;
-
import org.apache.geronimo.openejb.xbeans.ejbjar.OpenejbGeronimoEjbJarType;
import org.apache.geronimo.openejb.xbeans.ejbjar.OpenejbTssLinkType;
+import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
+import org.apache.openejb.jee.oejb2.GeronimoEjbJarType;
+import org.apache.openejb.jee.oejb2.TssLinkType;
+import org.osgi.framework.Bundle;
/**
* @version $Rev$ $Date$
@@ -82,18 +78,26 @@ public class CorbaModuleBuilderExtension
this.defaultEnvironment = defaultEnvironment;
}
+ @Override
public void doStart() throws Exception {
XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES);
}
+ @Override
public void doStop() {
XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES);
}
+ @Override
public void doFail() {
doStop();
}
+ @Override
+ public void createModule(Module module, Bundle bundle, Naming naming, ModuleIDBuilder moduleIDBuilder) throws DeploymentException {
+ //TODO what goes here?
+ }
+
/**
* Early module creation. If this module contains
* and CORBA enablement links, the corba default
@@ -114,6 +118,7 @@ public class CorbaModuleBuilderExtension
*
* @exception DeploymentException
*/
+ @Override
public void createModule(Module module, Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
if (module.getType() != ConfigurationModuleType.EJB) {
return;
@@ -135,10 +140,12 @@ public class CorbaModuleBuilderExtension
}
}
+ @Override
public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException {
}
- public void initContext(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException {
+ @Override
+ public void initContext(EARContext earContext, Module module, Bundle bundle) throws DeploymentException {
}
/**
@@ -148,14 +155,15 @@ public class CorbaModuleBuilderExtension
*
* @param earContext The earContext of the module deployment.
* @param module The module being deployed.
- * @param cl The module class loader instance.
+ * @param bundle The module class loader instance.
* @param repository The repository.
*
* @exception DeploymentException
* Thrown if any of the tss-link information cannot
* be resolved (missing ejb or TSSBean).
*/
- public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Collection repository) throws DeploymentException {
+ @Override
+ public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection repository) throws DeploymentException {
if (module.getType() != ConfigurationModuleType.EJB) {
return;
@@ -220,7 +228,7 @@ public class CorbaModuleBuilderExtension
* the abstract name for that EJB. The EJB must be part
* of the current module bean set to be resolveable.
*
- * @param context The ear context used for resolution.
+ * @param earContext The ear context used for resolution.
* @param ejbModule The EJBModule we're currently processing.
* @param name The name of the target EJB.
*
Copied: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/css/CSSConfigEditor.java (from r931738, geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/css/CSSConfigEditor.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/css/CSSConfigEditor.java?p2=geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/css/CSSConfigEditor.java&p1=geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/css/CSSConfigEditor.java&r1=931738&r2=932533&rev=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/css/CSSConfigEditor.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/css/CSSConfigEditor.java Fri Apr 9 17:58:36 2010
@@ -14,11 +14,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.corba.security.config.css;
+package org.apache.geronimo.corba.deployment.security.config.css;
import java.util.Iterator;
import java.util.List;
+import org.apache.geronimo.corba.security.config.css.CSSASMechConfig;
+import org.apache.geronimo.corba.security.config.css.CSSCompoundSecMechConfig;
+import org.apache.geronimo.corba.security.config.css.CSSCompoundSecMechListConfig;
+import org.apache.geronimo.corba.security.config.css.CSSConfig;
+import org.apache.geronimo.corba.security.config.css.CSSGSSUPMechConfigDynamic;
+import org.apache.geronimo.corba.security.config.css.CSSGSSUPMechConfigStatic;
+import org.apache.geronimo.corba.security.config.css.CSSNULLASMechConfig;
+import org.apache.geronimo.corba.security.config.css.CSSNULLTransportConfig;
+import org.apache.geronimo.corba.security.config.css.CSSSASITTAbsent;
+import org.apache.geronimo.corba.security.config.css.CSSSASITTAnonymous;
+import org.apache.geronimo.corba.security.config.css.CSSSASITTPrincipalNameDynamic;
+import org.apache.geronimo.corba.security.config.css.CSSSASITTPrincipalNameStatic;
+import org.apache.geronimo.corba.security.config.css.CSSSASMechConfig;
+import org.apache.geronimo.corba.security.config.css.CSSSSLTransportConfig;
+import org.apache.geronimo.corba.security.config.css.CSSTransportMechConfig;
+import org.apache.geronimo.gbean.annotation.GBean;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.omg.CSIIOP.CompositeDelegation;
@@ -50,25 +66,30 @@ import org.apache.geronimo.corba.xbeans.
import org.apache.geronimo.corba.xbeans.csiv2.css.CSSSasMechType;
import org.apache.geronimo.corba.xbeans.csiv2.css.CSSCssDocument;
import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSAssociationOption;
+import org.osgi.framework.Bundle;
/**
* @version $Revision: 451417 $ $Date: 2006-09-29 13:13:22 -0700 (Fri, 29 Sep 2006) $
*/
+@GBean(j2eeType = "XmlAttributeBuilder")
public class CSSConfigEditor implements XmlAttributeBuilder {
private static final String NAMESPACE = CSSCssDocument.type.getDocumentElementName().getNamespaceURI();
+ @Override
public String getNamespace() {
return NAMESPACE;
}
- public Object getValue(XmlObject xmlObject, String type, ClassLoader cl) throws DeploymentException {
+ @Override
+ public Object getValue(XmlObject xmlObject, String type, Bundle bundle) throws DeploymentException {
CSSCssType css;
if (xmlObject instanceof CSSCssType) {
css = (CSSCssType) xmlObject;
+ } else {
+ css = (CSSCssType) xmlObject.copy().changeType(CSSCssType.type);
}
- css = (CSSCssType) xmlObject.copy().changeType(CSSCssType.type);
try {
XmlBeansUtil.validateDD(css);
} catch (XmlException e) {
@@ -83,14 +104,14 @@ public class CSSConfigEditor implements
CSSCompoundSecMechType[] mechList = css.getCompoundSecMechTypeList().getCompoundSecMechArray();
for (int i = 0; i < mechList.length; i++) {
- mechListConfig.add(extractCompoundSecMech(mechList[i], cl));
+ mechListConfig.add(extractCompoundSecMech(mechList[i], bundle));
}
}
return cssConfig;
}
- protected static CSSCompoundSecMechConfig extractCompoundSecMech(CSSCompoundSecMechType mechType, ClassLoader cl) throws DeploymentException {
+ protected static CSSCompoundSecMechConfig extractCompoundSecMech(CSSCompoundSecMechType mechType, Bundle bundle) throws DeploymentException {
CSSCompoundSecMechConfig result = new CSSCompoundSecMechConfig();
@@ -110,7 +131,7 @@ public class CSSConfigEditor implements
result.setAs_mech(new CSSNULLASMechConfig());
}
- result.setSas_mech(extractSASMech(mechType.getSasMech(), cl));
+ result.setSas_mech(extractSASMech(mechType.getSasMech(), bundle));
return result;
}
@@ -132,7 +153,7 @@ public class CSSConfigEditor implements
return new CSSGSSUPMechConfigDynamic(gssupType.getDomain());
}
- protected static CSSSASMechConfig extractSASMech(CSSSasMechType sasMechType, ClassLoader cl) throws DeploymentException {
+ protected static CSSSASMechConfig extractSASMech(CSSSasMechType sasMechType, Bundle bundle) throws DeploymentException {
CSSSASMechConfig result = new CSSSASMechConfig();
if (sasMechType == null) {
@@ -149,7 +170,7 @@ public class CSSConfigEditor implements
String principalClassName = principal.getPrincipalClass();
Class principalClass = null;
try {
- principalClass = ClassLoading.loadClass(principalClassName, cl);
+ principalClass = ClassLoading.loadClass(principalClassName, bundle);
} catch (ClassNotFoundException e) {
throw new DeploymentException("Could not load principal class", e);
}
@@ -195,16 +216,4 @@ public class CSSConfigEditor implements
return result;
}
- public static final GBeanInfo GBEAN_INFO;
-
- static {
- GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(CSSConfigEditor.class, "XmlAttributeBuilder");
- infoBuilder.addInterface(XmlAttributeBuilder.class);
- GBEAN_INFO = infoBuilder.getBeanInfo();
- }
-
- public static GBeanInfo getGBeanInfo() {
- return GBEAN_INFO;
- }
-
}
Copied: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/tss/TSSConfigEditor.java (from r931738, geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSConfigEditor.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/tss/TSSConfigEditor.java?p2=geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/tss/TSSConfigEditor.java&p1=geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSConfigEditor.java&r1=931738&r2=932533&rev=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSConfigEditor.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/tss/TSSConfigEditor.java Fri Apr 9 17:58:36 2010
@@ -14,11 +14,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.corba.security.config.tss;
+package org.apache.geronimo.corba.deployment.security.config.tss;
import java.util.Iterator;
import java.util.List;
+import org.apache.geronimo.corba.security.config.tss.TSSASMechConfig;
+import org.apache.geronimo.corba.security.config.tss.TSSCompoundSecMechConfig;
+import org.apache.geronimo.corba.security.config.tss.TSSCompoundSecMechListConfig;
+import org.apache.geronimo.corba.security.config.tss.TSSConfig;
+import org.apache.geronimo.corba.security.config.tss.TSSGSSExportedNameConfig;
+import org.apache.geronimo.corba.security.config.tss.TSSGSSUPMechConfig;
+import org.apache.geronimo.corba.security.config.tss.TSSGeneralNameConfig;
+import org.apache.geronimo.corba.security.config.tss.TSSITTAbsent;
+import org.apache.geronimo.corba.security.config.tss.TSSITTAnonymous;
+import org.apache.geronimo.corba.security.config.tss.TSSITTDistinguishedName;
+import org.apache.geronimo.corba.security.config.tss.TSSITTPrincipalNameGSSUP;
+import org.apache.geronimo.corba.security.config.tss.TSSITTX509CertChain;
+import org.apache.geronimo.corba.security.config.tss.TSSNULLASMechConfig;
+import org.apache.geronimo.corba.security.config.tss.TSSNULLTransportConfig;
+import org.apache.geronimo.corba.security.config.tss.TSSSASMechConfig;
+import org.apache.geronimo.corba.security.config.tss.TSSSSLTransportConfig;
+import org.apache.geronimo.corba.security.config.tss.TSSTransportMechConfig;
+import org.apache.geronimo.gbean.annotation.GBean;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.apache.geronimo.common.DeploymentException;
@@ -48,6 +66,7 @@ import org.apache.geronimo.corba.xbeans.
import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSSasMechType;
import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSTssDocument;
import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSTssType;
+import org.osgi.framework.Bundle;
/**
@@ -55,6 +74,7 @@ import org.apache.geronimo.corba.xbeans.
*
* @version $Revision: 451417 $ $Date: 2006-09-29 13:13:22 -0700 (Fri, 29 Sep 2006) $
*/
+@GBean(j2eeType = "XmlAttributeBuilder")
public class TSSConfigEditor implements XmlAttributeBuilder {
private static final String NAMESPACE = TSSTssDocument.type.getDocumentElementName().getNamespaceURI();
@@ -71,7 +91,8 @@ public class TSSConfigEditor implements
* @throws org.apache.geronimo.common.propertyeditor.PropertyEditorException
* An IOException occured.
*/
- public Object getValue(XmlObject xmlObject, String type, ClassLoader cl) throws DeploymentException {
+ @Override
+ public Object getValue(XmlObject xmlObject, String type, Bundle bundle) throws DeploymentException {
TSSTssType tss;
if (xmlObject instanceof TSSTssType) {
tss = (TSSTssType) xmlObject;
@@ -103,7 +124,7 @@ public class TSSConfigEditor implements
TSSCompoundSecMechType[] mechList = tss.getCompoundSecMechTypeList().getCompoundSecMechArray();
for (int i = 0; i < mechList.length; i++) {
- TSSCompoundSecMechConfig cMech = extractCompoundSecMech(mechList[i], cl);
+ TSSCompoundSecMechConfig cMech = extractCompoundSecMech(mechList[i], bundle);
cMech.setTransport_mech(tssConfig.getTransport_mech());
mechListConfig.add(cMech);
}
@@ -124,7 +145,7 @@ public class TSSConfigEditor implements
return sslConfig;
}
- protected static TSSCompoundSecMechConfig extractCompoundSecMech(TSSCompoundSecMechType mech, ClassLoader cl) throws DeploymentException {
+ protected static TSSCompoundSecMechConfig extractCompoundSecMech(TSSCompoundSecMechType mech, Bundle bundle) throws DeploymentException {
TSSCompoundSecMechConfig result = new TSSCompoundSecMechConfig();
@@ -135,7 +156,7 @@ public class TSSConfigEditor implements
}
if (mech.isSetSasMech()) {
- result.setSas_mech(extractSASMech(mech.getSasMech(), cl));
+ result.setSas_mech(extractSASMech(mech.getSasMech(), bundle));
}
return result;
@@ -151,7 +172,7 @@ public class TSSConfigEditor implements
return gssupConfig;
}
- protected static TSSSASMechConfig extractSASMech(TSSSasMechType sasMech, ClassLoader cl) throws DeploymentException {
+ protected static TSSSASMechConfig extractSASMech(TSSSasMechType sasMech, Bundle bundle) throws DeploymentException {
TSSSASMechConfig sasMechConfig = new TSSSASMechConfig();
@@ -182,7 +203,7 @@ public class TSSConfigEditor implements
String principalClassName = ittPrincipalNameGSSUP.getPrincipalClass();
Class principalClass;
try {
- principalClass = ClassLoading.loadClass(principalClassName, cl);
+ principalClass = ClassLoading.loadClass(principalClassName, bundle);
} catch (ClassNotFoundException e) {
throw new DeploymentException("Could not load principal class", e);
}
@@ -251,16 +272,4 @@ public class TSSConfigEditor implements
return result;
}
- public static final GBeanInfo GBEAN_INFO;
-
- static {
- GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(TSSConfigEditor.class, "XmlAttributeBuilder");
- infoBuilder.addInterface(XmlAttributeBuilder.class);
- GBEAN_INFO = infoBuilder.getBeanInfo();
- }
-
- public static GBeanInfo getGBeanInfo() {
- return GBEAN_INFO;
- }
-
}
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/test/java/org/apache/geronimo/corba/security/config/tss/TSSConfigEditorTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/test/java/org/apache/geronimo/corba/security/config/tss/TSSConfigEditorTest.java?rev=932533&r1=932532&r2=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/test/java/org/apache/geronimo/corba/security/config/tss/TSSConfigEditorTest.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/test/java/org/apache/geronimo/corba/security/config/tss/TSSConfigEditorTest.java Fri Apr 9 17:58:36 2010
@@ -17,6 +17,7 @@
package org.apache.geronimo.corba.security.config.tss;
import junit.framework.TestCase;
+import org.apache.geronimo.corba.deployment.security.config.tss.TSSConfigEditor;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml?rev=932533&r1=932532&r2=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml Fri Apr 9 17:58:36 2010
@@ -43,6 +43,22 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-openejb</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee</artifactId>
+ <version>${version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/StandardServant.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/StandardServant.java?rev=932533&r1=932532&r2=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/StandardServant.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/StandardServant.java Fri Apr 9 17:58:36 2010
@@ -21,6 +21,7 @@ import java.rmi.AccessException;
import java.rmi.MarshalException;
import java.rmi.NoSuchObjectException;
import java.rmi.RemoteException;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Vector;
import java.util.Map;
@@ -120,10 +121,10 @@ public class StandardServant extends Ser
// create ReadOnlyContext
Map componentContext = new HashMap(2);
- componentContext.put("ORB", orb);
- componentContext.put("HandleDelegate", new CORBAHandleDelegate());
+ componentContext.put("comp/ORB", orb);
+ componentContext.put("comp/HandleDelegate", new CORBAHandleDelegate());
try {
- enc = EnterpriseNamingContext.createEnterpriseNamingContext(componentContext);
+ enc = EnterpriseNamingContext.livenReferences(componentContext, null, null, null, "comp");
} catch (NamingException e) {
throw new RuntimeException("Error creating standard servant naming context", e);
}
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java?rev=932533&r1=932532&r2=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java Fri Apr 9 17:58:36 2010
@@ -33,17 +33,15 @@ import javax.rmi.CORBA.ValueHandler;
import javax.transaction.InvalidTransactionException;
import javax.transaction.TransactionRequiredException;
import javax.transaction.TransactionRolledbackException;
-
import org.apache.geronimo.corba.AdapterWrapper;
import org.apache.geronimo.corba.CORBAException;
import org.apache.geronimo.corba.RefGenerator;
import org.apache.geronimo.corba.StandardServant;
import org.apache.openejb.BeanType;
+import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.InterfaceType;
-import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.core.ivm.BaseEjbProxyHandler;
import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
-import org.apache.openejb.core.stateful.StatefulEjbObjectHandler;
import org.apache.openejb.core.stateful.StatefulEjbObjectHandler.RegistryId;
import org.omg.CORBA.CompletionStatus;
import org.omg.CORBA.INVALID_TRANSACTION;
@@ -239,7 +237,7 @@ public final class UtilDelegateImpl impl
}
BaseEjbProxyHandler ejbProxyHandler = (BaseEjbProxyHandler) invocationHandler;
- CoreDeploymentInfo deploymentInfo = ejbProxyHandler.getDeploymentInfo();
+ DeploymentInfo deploymentInfo = ejbProxyHandler.getDeploymentInfo();
String deploymentId = (String) deploymentInfo.getDeploymentID();
try {
RefGenerator refGenerator = AdapterWrapper.getRefGenerator(deploymentId);
Modified: geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml?rev=932533&r1=932532&r2=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml Fri Apr 9 17:58:36 2010
@@ -87,6 +87,14 @@
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-rmi-impl</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java?rev=932533&r1=932532&r2=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java Fri Apr 9 17:58:36 2010
@@ -22,6 +22,8 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Properties;
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.geronimo.corba.CORBABean;
@@ -47,6 +49,7 @@ import org.omg.CORBA.Policy;
* CORBA support.
* @version $Revision: 497125 $ $Date: 2007-01-17 10:51:30 -0800 (Wed, 17 Jan 2007) $
*/
+@GBean(j2eeType = NameFactory.ORB_CONFIG)
public class ORBConfigAdapter implements GBeanLifecycle, ConfigAdapter {
private final Logger log = LoggerFactory.getLogger(ORBConfigAdapter.class);
Modified: geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/TSSConfigEditorTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/TSSConfigEditorTest.java?rev=932533&r1=932532&r2=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/TSSConfigEditorTest.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/TSSConfigEditorTest.java Fri Apr 9 17:58:36 2010
@@ -1,37 +1,37 @@
/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.geronimo.yoko;
import junit.framework.TestCase;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-
+import org.apache.geronimo.corba.CORBABean;
+import org.apache.geronimo.corba.deployment.security.config.tss.TSSConfigEditor;
+import org.apache.geronimo.corba.security.config.ConfigAdapter;
+import org.apache.geronimo.corba.security.config.tss.TSSConfig;
import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.kernel.Jsr77Naming;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.Jsr77Naming;
import org.apache.geronimo.kernel.Naming;
+import org.apache.geronimo.kernel.osgi.MockBundleContext;
import org.apache.geronimo.kernel.repository.Artifact;
-
+import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
import org.omg.CORBA.SystemException;
-import org.apache.geronimo.corba.CORBABean;
-import org.apache.geronimo.corba.security.config.ConfigAdapter;
-import org.apache.geronimo.corba.security.config.tss.TSSConfigEditor;
-import org.apache.geronimo.corba.security.config.tss.TSSConfig;
+import org.osgi.framework.Bundle;
/**
@@ -51,36 +51,36 @@ public class TSSConfigEditorTest extends
}
private static final String TEST_XML4 = " <tss:tss xmlns:tss=\"http://openejb.apache.org/xml/ns/corba-tss-config-2.1\" xmlns:sec=\"http://geronimo.apache.org/xml/ns/security-1.2\">\n" +
- " <tss:SSL port=\"6685\" hostname=\"localhost\">\n" +
- " <tss:supports>Integrity Confidentiality EstablishTrustInTarget EstablishTrustInClient</tss:supports>\n" +
- " <tss:requires>Integrity Confidentiality EstablishTrustInClient</tss:requires>\n" +
- " </tss:SSL>\n" +
- " <tss:compoundSecMechTypeList>\n" +
- " <tss:compoundSecMech>\n" +
- " <tss:GSSUP targetName=\"geronimo-properties-realm\"/>\n" +
- " <tss:sasMech>\n" +
- " <tss:identityTokenTypes><tss:ITTAnonymous/><tss:ITTPrincipalNameGSSUP principal-class=\"org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal\" domain=\"foo\"/><tss:ITTDistinguishedName domain=\"foo\"/><tss:ITTX509CertChain domain=\"foo\"/></tss:identityTokenTypes>\n" +
- " </tss:sasMech>\n" +
- " </tss:compoundSecMech>\n" +
- " </tss:compoundSecMechTypeList>\n" +
- " </tss:tss>";
+ " <tss:SSL port=\"6685\" hostname=\"localhost\">\n" +
+ " <tss:supports>Integrity Confidentiality EstablishTrustInTarget EstablishTrustInClient</tss:supports>\n" +
+ " <tss:requires>Integrity Confidentiality EstablishTrustInClient</tss:requires>\n" +
+ " </tss:SSL>\n" +
+ " <tss:compoundSecMechTypeList>\n" +
+ " <tss:compoundSecMech>\n" +
+ " <tss:GSSUP targetName=\"geronimo-properties-realm\"/>\n" +
+ " <tss:sasMech>\n" +
+ " <tss:identityTokenTypes><tss:ITTAnonymous/><tss:ITTPrincipalNameGSSUP principal-class=\"org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal\" domain=\"foo\"/><tss:ITTDistinguishedName domain=\"foo\"/><tss:ITTX509CertChain domain=\"foo\"/></tss:identityTokenTypes>\n" +
+ " </tss:sasMech>\n" +
+ " </tss:compoundSecMech>\n" +
+ " </tss:compoundSecMechTypeList>\n" +
+ " </tss:tss>";
public void testCORBABean() throws Exception {
- ClassLoader classLoader = getClass().getClassLoader();
+ Bundle bundle = new MockBundleContext(getClass().getClassLoader(), "", null, null).getBundle();
Naming naming = new Jsr77Naming();
- AbstractName testName = naming.createRootName(new Artifact("test", "stuff", "", "ear"), "gbean", NameFactory.CORBA_SERVICE) ;
+ AbstractName testName = naming.createRootName(new Artifact("test", "stuff", "", "ear"), "gbean", NameFactory.CORBA_SERVICE);
ConfigAdapter configAdapter = new org.apache.geronimo.yoko.ORBConfigAdapter();
- CORBABean corbaBean = new CORBABean(testName, configAdapter, "localhost", 8050, classLoader, null, null);
+ CORBABean corbaBean = new CORBABean(testName, configAdapter, "localhost", 8050, getClass().getClassLoader(), null, null);
XmlObject xmlObject = getXmlObject(TEST_XML4);
TSSConfigEditor editor = new TSSConfigEditor();
- Object o = editor.getValue(xmlObject, null, classLoader);
+ Object o = editor.getValue(xmlObject, null, bundle);
TSSConfig tss = (TSSConfig) o;
corbaBean.setTssConfig(tss);
try {
corbaBean.doStart();
- } catch(SystemException se) {
+ } catch (SystemException se) {
se.printStackTrace();
fail(se.getCause().getMessage());
} finally {
Modified: geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/history/dependencies.xml?rev=932533&r1=932532&r2=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/history/dependencies.xml Fri Apr 9 17:58:36 2010
@@ -11,7 +11,7 @@
<artifactId>j2ee-deployer</artifactId>
<type>car</type>
</dependency>
- <dependency start="true">
+ <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb-deployer</artifactId>
<type>car</type>
Modified: geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/plan/plan.xml?rev=932533&r1=932532&r2=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/plan/plan.xml Fri Apr 9 17:58:36 2010
@@ -21,8 +21,8 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
- <gbean name="CSSAttributeBuilder" class="org.apache.geronimo.corba.security.config.css.CSSConfigEditor"/>
- <gbean name="TSSAttributeBuilder" class="org.apache.geronimo.corba.security.config.tss.TSSConfigEditor"/>
+ <gbean name="CSSAttributeBuilder" class="org.apache.geronimo.corba.deployment.security.config.css.CSSConfigEditor"/>
+ <gbean name="TSSAttributeBuilder" class="org.apache.geronimo.corba.deployment.security.config.tss.TSSConfigEditor"/>
<gbean name="OpenEjbCorbaRefBuilder" class="org.apache.geronimo.corba.deployment.OpenEjbCorbaRefBuilder">
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
Modified: geronimo/server/trunk/plugins/corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/pom.xml?rev=932533&r1=932532&r2=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/pom.xml Fri Apr 9 17:58:36 2010
@@ -45,4 +45,54 @@
<module>openejb-corba-deployer</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-core</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-rmi-spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-spec-corba</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-spec-corba</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-rmi-spec</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-rmi-impl</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-rmi-spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.bcel</artifactId>
+ <version>5.2_2</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
</project>
Modified: geronimo/server/trunk/plugins/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/pom.xml?rev=932533&r1=932532&r2=932533&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/pom.xml Fri Apr 9 17:58:36 2010
@@ -64,6 +64,12 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <!-- duplicated in corba -->
+ <dependency>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-spec-corba</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=932533&r1=932532&r2=932533&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Apr 9 17:58:36 2010
@@ -869,46 +869,6 @@
</dependency>
<dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-core</artifactId>
- <version>1.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-rmi-spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-spec-corba</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-spec-corba</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-rmi-spec</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-rmi-impl</artifactId>
- <version>1.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-rmi-spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>