Skip to content
Permalink
Browse files
Merge branch 'yoko-util' into 'ibm-trunk'
Yoko util

See merge request !31
  • Loading branch information
ngmr committed Apr 27, 2015
2 parents 8a61500 + 370dad9 commit ff0e2a60a58d56b6ac9804b43b164bf7c6e18309
Show file tree
Hide file tree
Showing 33 changed files with 78 additions and 57 deletions.
@@ -75,7 +75,7 @@
<module>yoko-spec-corba</module>
<module>yoko-rmi-spec</module>
<module>yoko-rmi-impl</module>
<module>yoko-osgi</module>
<module>yoko-util</module>
</modules>

<dependencyManagement>
@@ -93,7 +93,7 @@
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-osgi</artifactId>
<artifactId>yoko-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -49,12 +49,12 @@
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-rmi-impl</artifactId>
<!-- TODO: figure out a way to set this back to <scope>test</scope>-->
<scope>provided</scope>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-osgi</artifactId>
<artifactId>yoko-util</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -72,10 +72,6 @@
<configuration>
<instructions>
<Bundle-Activator>org.apache.yoko.orb.activator.Activator</Bundle-Activator>
<Private-Package>
org.apache.yoko.orb.activator,
org.apache.yoko.osgi.locator.activator
</Private-Package>
</instructions>
</configuration>
</plugin>
@@ -104,6 +100,13 @@
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/endorsed</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-util</artifactId>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/endorsed</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
@@ -17,7 +17,7 @@

package org.apache.yoko.orb.CORBA;

import org.apache.yoko.osgi.ProviderLocator;
import org.apache.yoko.util.osgi.ProviderLocator;

//
// ObjectImpl is the base class for proprietary stubs with full
@@ -17,7 +17,7 @@

package org.apache.yoko.orb.OB;

import org.apache.yoko.osgi.ProviderLocator;
import org.apache.yoko.util.osgi.ProviderLocator;

public final class PluginManager {
//
@@ -17,7 +17,7 @@

package org.apache.yoko.orb.OB;

import org.apache.yoko.osgi.ProviderLocator;
import org.apache.yoko.util.osgi.ProviderLocator;
import org.omg.IOP.ServiceContext;
import org.omg.SendingContext.CodeBase;

@@ -22,7 +22,7 @@
import javax.rmi.CORBA.ValueHandler;

import org.apache.yoko.orb.CORBA.ORB;
import org.apache.yoko.osgi.ProviderLocator;
import org.apache.yoko.util.osgi.ProviderLocator;
import org.omg.CORBA.WStringValueHelper;
import org.omg.CORBA.portable.BoxedValueHelper;
import org.omg.CORBA.portable.IDLEntity;
@@ -26,7 +26,7 @@
import org.apache.yoko.orb.cmsf.CmsfIORInterceptor;
import org.apache.yoko.orb.cmsf.CmsfServerInterceptor;
import org.apache.yoko.orb.util.GetSystemPropertyAction;
import org.apache.yoko.osgi.ProviderLocator;
import org.apache.yoko.util.osgi.ProviderLocator;
import org.omg.CORBA.OBJECT_NOT_EXIST;

// This class must be public and not final
@@ -16,7 +16,7 @@
*/

package org.apache.yoko.orb.OBMessaging;
import org.apache.yoko.osgi.ProviderLocator;
import org.apache.yoko.util.osgi.ProviderLocator;
import org.omg.CORBA.Any;

public class ExceptionHolder_impl extends org.omg.Messaging._ExceptionHolder {
@@ -17,7 +17,7 @@

package org.apache.yoko.orb.OBMessaging;

import org.apache.yoko.osgi.ProviderLocator;
import org.apache.yoko.util.osgi.ProviderLocator;

public class UserExceptionRaiseProxy {
public void raise(org.omg.Messaging._ExceptionHolder execptHolder)
@@ -24,7 +24,7 @@
import org.apache.yoko.orb.OB.AssertionFailed;
import org.apache.yoko.orb.OCI.IIOP.ConnectionHelper;
import org.apache.yoko.orb.OCI.IIOP.ExtendedConnectionHelper;
import org.apache.yoko.osgi.ProviderLocator;
import org.apache.yoko.util.osgi.ProviderLocator;

public class iiop implements PluginInit {
static final Logger logger = Logger.getLogger(iiop.class.getName());
@@ -1,6 +1,6 @@
package org.apache.yoko.orb.activator;

import org.apache.yoko.osgi.locator.activator.AbstractBundleActivator;
import org.apache.yoko.util.osgi.locator.activator.AbstractBundleActivator;

public class Activator extends AbstractBundleActivator {

@@ -9,7 +9,7 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;

import org.apache.yoko.rmi.cmsf.CmsfThreadLocal;
import org.apache.yoko.util.cmsf.CmsfThreadLocal;
import org.omg.CORBA.BAD_PARAM;
import org.omg.CORBA.LocalObject;
import org.omg.IOP.TAG_RMI_CUSTOM_MAX_STREAM_FORMAT;
@@ -11,7 +11,7 @@
import java.util.logging.Logger;

import org.apache.yoko.orb.OB.IORUtil;
import org.apache.yoko.rmi.cmsf.CmsfThreadLocal;
import org.apache.yoko.util.cmsf.CmsfThreadLocal;
import org.omg.CORBA.BAD_PARAM;
import org.omg.CORBA.INTERNAL;
import org.omg.CORBA.LocalObject;
@@ -21,8 +21,9 @@
import javax.security.auth.login.LoginException;

import java.security.AccessController;

import org.apache.yoko.orb.util.GetSystemPropertyAction;
import org.apache.yoko.osgi.ProviderLocator;
import org.apache.yoko.util.osgi.ProviderLocator;

public abstract class SecurityContext {

@@ -27,7 +27,7 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

import org.apache.yoko.osgi.ProviderLocator;
import org.apache.yoko.util.osgi.ProviderLocator;

public class ProcessAgentImpl extends UnicastRemoteObject implements ProcessAgent {
private static final long serialVersionUID = 1L;
@@ -42,7 +42,8 @@
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-osgi</artifactId>
<artifactId>yoko-util</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -70,7 +71,6 @@
<instructions>
<Bundle-Activator>org.apache.yoko.rmi.osgi.activator.Activator</Bundle-Activator>
<Export-Package>
org.apache.yoko.osgi.locator,
org.apache.yoko.rmi.impl,
org.apache.yoko.rmi.api,
org.apache.yoko.rmi.util,
@@ -79,12 +79,9 @@
org.apache.yoko.rmi.cmsf
</Export-Package>
<Import-Package>
!sun.*,*
!sun.*,
*
</Import-Package>
<Private-Package>
org.apache.yoko.rmi.osgi.activator,
org.apache.yoko.osgi.locator.activator
</Private-Package>
</instructions>
</configuration>
</plugin>
@@ -20,8 +20,8 @@

import java.security.AccessController;

import org.apache.yoko.osgi.ProviderLocator;
import org.apache.yoko.rmi.util.GetSystemPropertyAction;
import org.apache.yoko.util.osgi.ProviderLocator;

public class PortableRemoteObjectExt {

@@ -29,7 +29,7 @@
import java.util.HashMap;
import java.util.Map;

import org.apache.yoko.rmi.cmsf.CmsfThreadLocal;
import org.apache.yoko.util.cmsf.CmsfThreadLocal;

abstract class ObjectWriter extends ObjectOutputStream {
protected final Serializable object;
@@ -46,8 +46,8 @@
import javax.rmi.CORBA.UtilDelegate;
import javax.rmi.CORBA.ValueHandler;

import org.apache.yoko.osgi.ProviderLocator;
import org.apache.yoko.rmi.util.GetSystemPropertyAction;
import org.apache.yoko.util.osgi.ProviderLocator;
import org.omg.CORBA.Any;
import org.omg.CORBA.BAD_PARAM;
import org.omg.CORBA.COMM_FAILURE;
@@ -2,9 +2,9 @@

import javax.rmi.CORBA.Stub;

import org.apache.yoko.osgi.locator.ProviderRegistryImpl;
import org.apache.yoko.osgi.locator.Register;
import org.apache.yoko.osgi.locator.activator.AbstractBundleActivator;
import org.apache.yoko.util.osgi.locator.ProviderRegistryImpl;
import org.apache.yoko.util.osgi.locator.Register;
import org.apache.yoko.util.osgi.locator.activator.AbstractBundleActivator;
import org.omg.stub.java.rmi._Remote_Stub;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
@@ -18,7 +18,7 @@

package org.apache.yoko.rmispec.util;

import org.apache.yoko.osgi.ProviderLocator;
import org.apache.yoko.util.osgi.ProviderLocator;

import java.net.MalformedURLException;
import java.net.URL;
@@ -29,6 +29,11 @@
<name>Apache Yoko CORBA Spec</name>

<dependencies>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-util</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -16,7 +16,7 @@
*/
package org.omg.CORBA;

import org.apache.yoko.osgi.ProviderLocator;
import org.apache.yoko.util.osgi.ProviderLocator;

import java.security.PrivilegedAction;
import java.security.AccessController;
@@ -23,16 +23,15 @@
<groupId>org.apache.yoko</groupId>
<version>1.5-SNAPSHOT</version>
</parent>
<artifactId>yoko-osgi</artifactId>
<name>Apache Yoko OSGI Support</name>

<artifactId>yoko-util</artifactId>

<name>Apache Yoko Utilities</name>

<packaging>bundle</packaging>

<dependencies>
<!-- this contains the osgi-relevant classes in the endorsed dir -->
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-spec-corba</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -46,4 +45,20 @@
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
org.apache.yoko.util.*
</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project>
@@ -1,4 +1,4 @@
package org.apache.yoko.rmi.cmsf;
package org.apache.yoko.util.cmsf;

import java.util.logging.Level;
import java.util.logging.Logger;
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.yoko.osgi;
package org.apache.yoko.util.osgi;

import java.io.BufferedReader;
import java.io.File;
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.yoko.osgi;
package org.apache.yoko.util.osgi;

import java.util.List;

@@ -18,7 +18,7 @@
*/


package org.apache.yoko.osgi.locator;
package org.apache.yoko.util.osgi.locator;

import org.osgi.framework.Bundle;

@@ -18,7 +18,7 @@
*/


package org.apache.yoko.osgi.locator;
package org.apache.yoko.util.osgi.locator;

import java.util.logging.Logger;

@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.yoko.osgi.locator;
package org.apache.yoko.util.osgi.locator;

import java.util.ArrayList;
import java.util.Collections;
@@ -24,13 +24,13 @@
import java.util.logging.Level;
import java.util.logging.Logger;

import org.apache.yoko.osgi.ProviderLocator;
import org.apache.yoko.util.osgi.ProviderLocator;

/**
* The implementation of the provider registry used to store
* the bundle registrations.
*/
public class ProviderRegistryImpl implements org.apache.yoko.osgi.ProviderRegistry, Register {
public class ProviderRegistryImpl implements org.apache.yoko.util.osgi.ProviderRegistry, Register {

private static final Logger log = Logger.getLogger(ProviderRegistryImpl.class.getName());
// our mapping between a provider id and the implementation information. There

0 comments on commit ff0e2a6

Please sign in to comment.