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/15 09:21:42 UTC
svn commit: r934311 - in /geronimo/server/trunk:
framework/buildsupport/car-maven-plugin/
framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/
framework/configs/karaf-framework/ framework/configs/karaf-framework/s...
Author: djencks
Date: Thu Apr 15 07:21:41 2010
New Revision: 934311
URL: http://svn.apache.org/viewvc?rev=934311&view=rev
Log:
GERONIMO-5092 corba plugins start, handle delegate gets into jndi, doesn't seem to break ejbs
Added:
geronimo/server/trunk/plugins/corba/corba-server/
geronimo/server/trunk/plugins/corba/corba-server/pom.xml (with props)
geronimo/server/trunk/plugins/corba/corba-server/src/
geronimo/server/trunk/plugins/corba/corba-server/src/main/
geronimo/server/trunk/plugins/corba/corba-server/src/main/resources/
Removed:
geronimo/server/trunk/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapterGBean.java
Modified:
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
geronimo/server/trunk/plugingroups/ejb/pom.xml
geronimo/server/trunk/plugingroups/ejb/src/main/history/dependencies.xml
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/geronimo-corba-builder/pom.xml
geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java
geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java
geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml
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/NameServiceTest.java
geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/TSSConfigEditorTest.java
geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml
geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml
geronimo/server/trunk/plugins/corba/pom.xml
geronimo/server/trunk/plugins/pom.xml
Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml?rev=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml Thu Apr 15 07:21:41 2010
@@ -126,6 +126,17 @@
</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.maven</groupId>
<artifactId>maven-project</artifactId>
<version>2.2.1</version>
Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Thu Apr 15 07:21:41 2010
@@ -790,6 +790,7 @@ public abstract class AbstractCarMojo
"net.sf.cglib.proxy," +
"net.sf.cglib.reflect," +
"sun.misc," +
+ "sun.reflect," +
"org.apache.commons.jexl;version=\"1.1\"," +
"org.apache.commons.jexl.context;version=\"1.1\"," +
"org.apache.commons.jexl.resolver;version=\"1.1\"," +
@@ -836,6 +837,8 @@ public abstract class AbstractCarMojo
"org.apache.geronimo.system.util," +
"org.apache.geronimo.mavenplugins.car," +
"org.apache.felix.karaf.jaas.boot;version=\"1.5.0\"," +
+ "org.apache.yoko," +
+ "org.apache.yoko.osgi," +
"org.apache.yoko.rmispec.util"
);
/*
Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Thu Apr 15 07:21:41 2010
@@ -45,7 +45,7 @@
<felix.compendium.version>1.2.0</felix.compendium.version>
<felix.configadmin.version>1.2.4</felix.configadmin.version>
<felix.fileinstall.version>2.0.8</felix.fileinstall.version>
- <felix.framework.version>2.0.4</felix.framework.version>
+ <felix.framework.version>2.1.0-SNAPSHOT</felix.framework.version>
<felix.gogo.version>0.2.2</felix.gogo.version>
<felix.osgi.version>1.4.0</felix.osgi.version>
<felix.plugin.version>2.0.1</felix.plugin.version>
@@ -467,6 +467,17 @@
<artifactId>geronimo-shell-base</artifactId>
<version>${version}</version>
</dependency>
+ <!-- endorsed -->
+ <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>
</dependencies>
<build>
<!--<resources>-->
@@ -629,6 +640,18 @@
<outputDirectory>target/dependencies/lib</outputDirectory>
<destFileName>commons-cli.jar</destFileName>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-spec-corba</artifactId>
+ <outputDirectory>target/dependencies/lib/endorsed</outputDirectory>
+ <destFileName>yoko-spec-corba.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-rmi-spec</artifactId>
+ <outputDirectory>target/dependencies/lib/endorsed</outputDirectory>
+ <destFileName>yoko-rmi-spec.jar</destFileName>
+ </artifactItem>
<!--<artifactItem>-->
<!--<groupId>org.apache.xbean</groupId>-->
<!--<artifactId>xbean-naming</artifactId>-->
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo?rev=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo Thu Apr 15 07:21:41 2010
@@ -225,6 +225,10 @@ setupDefaults() {
CLASSPATH="$CLASSPATH:$file"
fi
done
+
+ EXT_DIRS="$KARAF_HOME/lib/ext:$JAVA_HOME/lib/ext"
+ ENDORSED_DIRS="$KARAF_HOME/lib/endorsed:$JAVA_HOME/lib/endorsed"
+
DEFAULT_JAVA_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
##
@@ -284,8 +288,20 @@ run() {
KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"`
KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"`
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ EXT_DIRS=`cygpath --path --windows "$EXT_DIRS"`
+ ENDORSED_DIRS=`cygpath --path --windows "$ENDORSED_DIRS"`
fi
- exec $JAVA $JAVA_OPTS -Dorg.apache.geronimo.home.dir="$KARAF_HOME" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $OPTS -classpath "$CLASSPATH" org.apache.geronimo.cli.daemon.DaemonCLI "$@"
+ exec $JAVA $JAVA_OPTS \
+ -Dorg.apache.geronimo.home.dir="$KARAF_HOME" \
+ -Dkaraf.home="$KARAF_HOME" \
+ -Dkaraf.base="$KARAF_BASE" \
+ -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties \
+ -Djava.endorsed.dirs="$ENDORSED_DIRS" \
+ -Djava.ext.dirs="$EXT_DIRS" \
+ $OPTS \
+ -classpath "$CLASSPATH" \
+ org.apache.geronimo.cli.daemon.DaemonCLI \
+ "$@"
}
main() {
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties?rev=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties Thu Apr 15 07:21:41 2010
@@ -40,6 +40,9 @@ org.osgi.framework.system.packages=org.o
org.osgi.framework.system.packages.extra=\
sun.misc, \
+ sun.reflect, \
+ org.apache.yoko, \
+ org.apache.yoko.osgi, \
org.apache.felix.karaf.jaas.boot; version=${karaf.osgi.version}, \
org.apache.felix.karaf.version; version=${karaf.osgi.version}, \
org.apache.geronimo.main; version=${karaf.osgi.version}, \
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml Thu Apr 15 07:21:41 2010
@@ -382,6 +382,16 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-rmi-spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-spec-corba</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.eclipse</groupId>
<artifactId>osgi</artifactId>
<type>jar</type>
@@ -406,4 +416,14 @@
<artifactId>pax-url-wrap</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugingroups/ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/ejb/pom.xml?rev=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/ejb/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/ejb/pom.xml Thu Apr 15 07:21:41 2010
@@ -38,19 +38,19 @@
</description>
<dependencies>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>openejb-corba-deployer</artifactId>-->
- <!--<version>${version}</version>-->
- <!--<type>car</type>-->
- <!--</dependency>-->
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb-corba-deployer</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>j2ee-corba-yoko</artifactId>-->
- <!--<version>${version}</version>-->
- <!--<type>car</type>-->
- <!--</dependency>-->
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-corba-yoko</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.configs</groupId>-->
Modified: geronimo/server/trunk/plugingroups/ejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/ejb/src/main/history/dependencies.xml?rev=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/ejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/ejb/src/main/history/dependencies.xml Thu Apr 15 07:21:41 2010
@@ -8,11 +8,21 @@
</module-id>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-corba-yoko</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb</artifactId>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb-corba-deployer</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb-deployer</artifactId>
<type>car</type>
</dependency>
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=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml Thu Apr 15 07:21:41 2010
@@ -129,18 +129,25 @@
<dependency>
<groupId>org.apache.yoko</groupId>
- <artifactId>yoko-core</artifactId>
+ <artifactId>yoko-rmi-impl</artifactId>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
- <artifactId>yoko-spec-corba</artifactId>
+ <artifactId>yoko-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-rmi-impl</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.yoko</groupId>-->
+ <!--<artifactId>yoko-spec-corba</artifactId>-->
+ <!--<scope>provided</scope>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.yoko</groupId>-->
+ <!--<artifactId>yoko-rmi-spec</artifactId>-->
+ <!--<scope>provided</scope>-->
+ <!--</dependency>-->
+
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
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=934311&r1=934310&r2=934311&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 Thu Apr 15 07:21:41 2010
@@ -7,11 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>org.apache.bcel</groupId>
- <artifactId>bcel</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client</artifactId>
<type>car</type>
@@ -46,9 +41,4 @@
<artifactId>yoko-rmi-impl</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-spec-corba</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Added: geronimo/server/trunk/plugins/corba/corba-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/corba-server/pom.xml?rev=934311&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/corba/corba-server/pom.xml (added)
+++ geronimo/server/trunk/plugins/corba/corba-server/pom.xml Thu Apr 15 07:21:41 2010
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!-- $Rev$ $Date$ -->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>corba</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>corba-server</artifactId>
+ <packaging>server-assembly</packaging>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <version>${version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <servers>
+ <serverInstance>
+ <name>default</name>
+ <configFile>var/config/config.xml</configFile>
+ <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+ <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+ <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ <serverInstance>
+ <name>client</name>
+ <attributeManagerFrom>default</attributeManagerFrom>
+ <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ <serverInstance>
+ <name>offline</name>
+ <configFile>var/config/offline-deployer-config.xml</configFile>
+ <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+ <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+ <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ <serverInstance>
+ <name>jsr88</name>
+ <configFile>var/config/jsr88-configurer-config.xml</configFile>
+ <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+ <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+ <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ </servers>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>karaf-framework</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-corba-yoko</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb-corba-deployer</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+</project>
Propchange: geronimo/server/trunk/plugins/corba/corba-server/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/corba/corba-server/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/corba/corba-server/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
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=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml Thu Apr 15 07:21:41 2010
@@ -39,7 +39,12 @@
<artifactId>geronimo-corba</artifactId>
<version>${version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-spec-corba</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- g-security-builder, g-naming-builder comes from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java?rev=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java Thu Apr 15 07:21:41 2010
@@ -20,6 +20,10 @@ package org.apache.geronimo.corba.deploy
import java.util.Collection;
import java.util.Map;
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamAttribute;
+import org.apache.geronimo.gbean.annotation.ParamReference;
+import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.QNameSet;
import org.apache.geronimo.kernel.repository.Artifact;
@@ -39,13 +43,15 @@ import org.apache.geronimo.gbean.SingleE
/**
* @version $Rev$ $Date$
*/
+@GBean(j2eeType = NameFactory.MODULE_BUILDER)
public class CorbaRefBuilder extends AbstractNamingBuilder {
- private final SingleElementCollection corbaGBeanNameSourceCollection;
+ private final SingleElementCollection<CorbaGBeanNameSource> corbaGBeanNameSourceCollection;
- public CorbaRefBuilder(Environment defaultEnvironment, Collection corbaGBeanNameSource) {
+ public CorbaRefBuilder(@ParamAttribute(name = "defaultEnvironment")Environment defaultEnvironment,
+ @ParamReference(name="CorbaGBeanNameSource")Collection<CorbaGBeanNameSource> corbaGBeanNameSource) {
super(defaultEnvironment);
- this.corbaGBeanNameSourceCollection = new SingleElementCollection(corbaGBeanNameSource);
+ this.corbaGBeanNameSourceCollection = new SingleElementCollection<CorbaGBeanNameSource>(corbaGBeanNameSource);
}
protected boolean willMergeEnvironment(XmlObject specDD, XmlObject plan) throws DeploymentException {
@@ -55,16 +61,15 @@ public class CorbaRefBuilder extends Abs
// return false;
}
- public void buildNaming(XmlObject specDD, XmlObject plan, Module module, Map componentContext) throws DeploymentException {
+ public void buildNaming(XmlObject specDD, XmlObject plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
if (matchesDefaultEnvironment(module.getEnvironment())) {
- CorbaGBeanNameSource corbaGBeanNameSource = (CorbaGBeanNameSource) corbaGBeanNameSourceCollection.getElement();
+ CorbaGBeanNameSource corbaGBeanNameSource = corbaGBeanNameSourceCollection.getElement();
if (corbaGBeanNameSource != null) {
AbstractNameQuery corbaName = corbaGBeanNameSource.getCorbaGBeanName();
if (corbaName != null) {
Artifact[] moduleId = module.getConfigId();
- Map context = getJndiContextMap(componentContext);
- context.put("ORB", new ORBReference(moduleId, corbaName));
- context.put("HandleDelegate", new HandleDelegateReference(moduleId, corbaName));
+ put("env/ORB", new ORBReference(moduleId, corbaName), JNDI_KEY.get(sharedContext));
+ put("env/HandleDelegate", new HandleDelegateReference(moduleId, corbaName), JNDI_KEY.get(sharedContext));
}
}
}
@@ -78,18 +83,4 @@ public class CorbaRefBuilder extends Abs
return QNameSet.EMPTY;
}
- public static final GBeanInfo GBEAN_INFO;
-
- static {
- GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(CorbaRefBuilder.class, NameFactory.MODULE_BUILDER);
- infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
- infoBuilder.addReference("CorbaGBeanNameSource", CorbaGBeanNameSource.class);
- infoBuilder.setConstructor(new String[]{"defaultEnvironment", "CorbaGBeanNameSource"});
- GBEAN_INFO = infoBuilder.getBeanInfo();
- }
-
- public static GBeanInfo getGBeanInfo() {
- return GBEAN_INFO;
- }
-
}
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java?rev=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java Thu Apr 15 07:21:41 2010
@@ -28,6 +28,8 @@ import org.apache.geronimo.common.Deploy
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamAttribute;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.Module;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
@@ -52,6 +54,7 @@ import org.osgi.framework.Bundle;
*
* @version $Revision$ $Date$
*/
+@GBean(j2eeType = NameFactory.MODULE_BUILDER)
public class OpenEjbCorbaRefBuilder extends EjbRefBuilder {
private static final QName GER_EJB_REF_QNAME = GerEjbRefDocument.type.getDocumentElementName();
@@ -63,7 +66,8 @@ public class OpenEjbCorbaRefBuilder exte
private final QNameSet ejbRefQNameSet;
- public OpenEjbCorbaRefBuilder(Environment defaultEnvironment, String[] eeNamespaces) throws URISyntaxException {
+ public OpenEjbCorbaRefBuilder(@ParamAttribute(name = "defaultEnvironment")Environment defaultEnvironment,
+ @ParamAttribute(name = "eeNamespaces")String[] eeNamespaces) throws URISyntaxException {
super(defaultEnvironment, new String[0], null, -1);
ejbRefQNameSet = buildQNameSet(eeNamespaces, "ejb-ref");
}
@@ -175,21 +179,4 @@ public class OpenEjbCorbaRefBuilder exte
return refMap;
}
-
- public static final GBeanInfo GBEAN_INFO;
-
- static {
- GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(OpenEjbCorbaRefBuilder.class, NameFactory.MODULE_BUILDER); //TODO decide what type this should be
- infoBuilder.addAttribute("eeNamespaces", String[].class, true, true);
- infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
-
- infoBuilder.setConstructor(new String[]{"defaultEnvironment", "eeNamespaces"});
-
- GBEAN_INFO = infoBuilder.getBeanInfo();
- }
-
- public static GBeanInfo getGBeanInfo() {
- return GBEAN_INFO;
- }
-
}
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=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml Thu Apr 15 07:21:41 2010
@@ -63,6 +63,7 @@
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-spec-corba</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
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=934311&r1=934310&r2=934311&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 Thu Apr 15 07:21:41 2010
@@ -65,19 +65,25 @@ public final class UtilDelegateImpl impl
private final Logger log = LoggerFactory.getLogger(UtilDelegateImpl.class);
private final UtilDelegate delegate;
+ private static Class<? extends UtilDelegate> delegateClass;
private static ClassLoader classLoader;
private final static String DELEGATE_NAME = "org.apache.geronimo.corba.UtilDelegateClass";
public UtilDelegateImpl() throws ClassNotFoundException, IllegalAccessException, InstantiationException {
- String value = System.getProperty(DELEGATE_NAME);
- if (value == null) {
- log.error("No delegate specfied via " + DELEGATE_NAME);
- throw new IllegalStateException("The property " + DELEGATE_NAME + " must be defined!");
- }
+// String value = System.getProperty(DELEGATE_NAME);
+// if (value == null) {
+// log.error("No delegate specfied via " + DELEGATE_NAME);
+// throw new IllegalStateException("The property " + DELEGATE_NAME + " must be defined!");
+// }
+//
+// if (log.isDebugEnabled()) log.debug("Set delegate " + value);
+// delegate = (UtilDelegate) Class.forName(value).newInstance();
+ delegate = delegateClass.newInstance();
+ }
- if (log.isDebugEnabled()) log.debug("Set delegate " + value);
- delegate = (UtilDelegate) Class.forName(value).newInstance();
+ public static void setDelegateClass(Class<? extends UtilDelegate> delegateClass) {
+ UtilDelegateImpl.delegateClass = delegateClass;
}
static void setClassLoader(ClassLoader classLoader) {
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=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml Thu Apr 15 07:21:41 2010
@@ -75,17 +75,18 @@
<dependency>
<groupId>org.apache.yoko</groupId>
- <artifactId>yoko-core</artifactId>
+ <artifactId>yoko-spec-corba</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
- <artifactId>yoko-spec-corba</artifactId>
+ <artifactId>yoko-rmi-impl</artifactId>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
- <artifactId>yoko-rmi-impl</artifactId>
+ <artifactId>yoko-core</artifactId>
</dependency>
<dependency>
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=934311&r1=934310&r2=934311&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 Thu Apr 15 07:21:41 2010
@@ -16,14 +16,20 @@
*/
package org.apache.geronimo.yoko;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import java.util.Properties;
+import javax.rmi.CORBA.UtilDelegate;
+import org.apache.geronimo.corba.util.UtilDelegateImpl;
import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamSpecial;
+import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.osgi.framework.Bundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.geronimo.corba.CORBABean;
@@ -50,13 +56,10 @@ import org.omg.CORBA.Policy;
* @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 {
+public class ORBConfigAdapter implements ConfigAdapter {
private final Logger log = LoggerFactory.getLogger(ORBConfigAdapter.class);
- public ORBConfigAdapter() {
- }
-
/**
* Start the config adapter GBean. This is basically
* an opportunity to set any system properties
@@ -64,9 +67,9 @@ public class ORBConfigAdapter implements
* this makes the ORB hookups for the RMI over IIOP
* support.
*
- * @exception Exception
+ * @exception Exception due to class loading problems or narrow not working
*/
- public void doStart() throws Exception {
+ public ORBConfigAdapter(@ParamSpecial(type = SpecialAttributeType.bundle) Bundle bundle) throws Exception {
// define the default ORB for ORB.init();
System.setProperty("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
System.setProperty("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
@@ -78,13 +81,14 @@ public class ORBConfigAdapter implements
System.setProperty("javax.rmi.CORBA.UtilClass", "org.apache.geronimo.corba.util.UtilDelegateImpl");
// this tells the openejb UtilDelegateImpl which implementation to delegate non-overridden
// operations to.
- System.setProperty("org.apache.geronimo.corba.UtilDelegateClass", "org.apache.yoko.rmi.impl.UtilImpl");
- // this allows us to hook RMI stub invocation/serialization events.
+// System.setProperty("org.apache.geronimo.corba.UtilDelegateClass", "org.apache.yoko.rmi.impl.UtilImpl");
+ // this allows us to hook RMI stub invocation/serialization events.
+ UtilDelegateImpl.setDelegateClass(bundle.loadClass("org.apache.yoko.rmi.impl.UtilImpl").asSubclass(UtilDelegate.class));
System.setProperty("org.apache.yoko.rmi.RMIStubInitializerClass", "org.apache.geronimo.yoko.RMIStubHandlerFactory");
// ok, now we have a potential classloading problem because of where our util delegates are located.
// by forcing these classes to load now using our class loader, we can ensure things are properly initialized
- Class clazz = this.getClass().getClassLoader().loadClass("javax.rmi.PortableRemoteObject");
+ Class clazz = bundle.loadClass("javax.rmi.PortableRemoteObject");
Method m = clazz.getMethod("narrow", Object.class, Class.class);
m.invoke(null, new Object(), Object.class);
@@ -92,16 +96,6 @@ public class ORBConfigAdapter implements
log.debug("Started Yoko ORBConfigAdapter");
}
- public void doStop() throws Exception {
- // nothing really required here.
- log.debug("Stopped Yoko ORBConfigAdapter");
- }
-
- public void doFail() {
- // nothing much to do.
- log.warn("Failed Yoko ORBConfigAdapter");
- }
-
/**
* Create an ORB for a CORBABean server context.
*
Modified: geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/NameServiceTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/NameServiceTest.java?rev=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/NameServiceTest.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/NameServiceTest.java Thu Apr 15 07:21:41 2010
@@ -21,6 +21,8 @@ import java.util.Properties;
import org.apache.geronimo.corba.NameService;
import junit.framework.TestCase;
+import org.apache.geronimo.kernel.osgi.MockBundle;
+import org.osgi.framework.Bundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.geronimo.system.serverinfo.ServerInfo;
@@ -49,10 +51,9 @@ public class NameServiceTest extends Tes
String tmpDir = System.getProperty("java.io.tmpdir");
ServerInfo serverInfo = new BasicServerInfo(tmpDir);
-
- ORBConfigAdapter adapter = new ORBConfigAdapter();
+ Bundle bundle = new MockBundle(getClass().getClassLoader(), "", 0);
+ ORBConfigAdapter adapter = new ORBConfigAdapter(bundle);
// make sure all system properties are initialized.
- adapter.doStart();
nameService = new NameService(serverInfo, adapter, "localhost", 8050);
nameService.doStart();
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=934311&r1=934310&r2=934311&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 Thu Apr 15 07:21:41 2010
@@ -69,7 +69,7 @@ public class TSSConfigEditorTest extends
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);
- ConfigAdapter configAdapter = new org.apache.geronimo.yoko.ORBConfigAdapter();
+ ConfigAdapter configAdapter = new org.apache.geronimo.yoko.ORBConfigAdapter(bundle);
CORBABean corbaBean = new CORBABean(testName, configAdapter, "localhost", 8050, getClass().getClassLoader(), null, null);
XmlObject xmlObject = getXmlObject(TEST_XML4);
TSSConfigEditor editor = new TSSConfigEditor();
Modified: geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml?rev=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml Thu Apr 15 07:21:41 2010
@@ -76,10 +76,10 @@
<artifactId>yoko-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-spec-corba</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.yoko</groupId>-->
+ <!--<artifactId>yoko-spec-corba</artifactId>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.yoko</groupId>
@@ -87,8 +87,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/j2ee-corba-yoko/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/history/dependencies.xml?rev=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/history/dependencies.xml Thu Apr 15 07:21:41 2010
@@ -7,11 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>org.apache.bcel</groupId>
- <artifactId>bcel</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb</artifactId>
<type>car</type>
@@ -27,6 +22,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/j2ee-corba-yoko/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml?rev=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml Thu Apr 15 07:21:41 2010
@@ -27,7 +27,7 @@
</dependency>
</gbean>
- <gbean name="ORBConfigAdapter" class="org.apache.geronimo.yoko.ORBConfigAdapterGBean"/>
+ <gbean name="ORBConfigAdapter" class="org.apache.geronimo.yoko.ORBConfigAdapter"/>
<gbean name="NameServer" class="org.apache.geronimo.corba.NameServiceGBean">
<reference name="ServerInfo">
Modified: geronimo/server/trunk/plugins/corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/pom.xml?rev=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/pom.xml Thu Apr 15 07:21:41 2010
@@ -15,9 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- $Rev$ $Date$ -->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -43,24 +41,22 @@
<module>geronimo-yoko</module>
<module>j2ee-corba-yoko</module>
<module>openejb-corba-deployer</module>
- </modules>
+ </modules>
+ <profiles>
+ <profile>
+ <id>mini-servers</id>
+ <modules>
+ <module>corba-server</module>
+ </modules>
+ </profile>
+ </profiles>
<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>
@@ -79,12 +75,6 @@
<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>
@@ -95,4 +85,4 @@
</dependencies>
</dependencyManagement>
-</project>
+</project>
\ No newline at end of file
Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=934311&r1=934310&r2=934311&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Thu Apr 15 07:21:41 2010
@@ -164,7 +164,7 @@
<module>clustering</module>
<module>connector-1_6</module>
<module>console</module>
- <!--<module>corba</module>-->
+ <module>corba</module>
<module>cxf</module>
<module>dojo</module>
<!--<module>debugviews</module>-->