Author: jlaskowski
Date: Sun Jan 3 02:39:14 2010
New Revision: 895326
URL: http://svn.apache.org/viewvc?rev=895326&view=rev
Log:
OPENEJB-1118 Split package org.apache.openejb.client
Submitted by: Jarek Gawor
Added:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/osgi/
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/osgi/client/
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/osgi/client/LocalInitialContextFactory.java
Modified:
openejb/trunk/openejb3/container/openejb-core/pom.xml
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java
openejb/trunk/openejb3/server/openejb-client/pom.xml
Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?rev=895326&r1=895325&r2=895326&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Sun Jan 3 02:39:14
2010
@@ -55,7 +55,7 @@
*
</openejb.osgi.import.pkg>
<openejb.osgi.export>
-
org.apache.openejb.client;partial=true;mandatory=partial;version=${openejb.osgi.export.version},
+ !org.apache.openejb.client,
org.apache.openejb*;version=${openejb.osgi.export.version}
</openejb.osgi.export>
</properties>
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java?rev=895326&r1=895325&r2=895326&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java
Sun Jan 3 02:39:14 2010
@@ -43,7 +43,7 @@
return getLocalInitialContext(env);
}
- private void init(Hashtable env) throws javax.naming.NamingException {
+ protected void init(Hashtable env) throws javax.naming.NamingException {
if (openejb != null) {
return;
}
Added:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/osgi/client/LocalInitialContextFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/osgi/client/LocalInitialContextFactory.java?rev=895326&view=auto
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/osgi/client/LocalInitialContextFactory.java
(added)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/osgi/client/LocalInitialContextFactory.java
Sun Jan 3 02:39:14 2010
@@ -0,0 +1,36 @@
+/**
+ *
+ * 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.openejb.osgi.client;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+
+import org.apache.openejb.client.LocalInitialContext;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class LocalInitialContextFactory extends
org.apache.openejb.client.LocalInitialContextFactory {
+
+ public Context getInitialContext(Hashtable env) throws
javax.naming.NamingException {
+ init(env);
+ return new LocalInitialContext(env, this);
+ }
+
+}
Modified: openejb/trunk/openejb3/server/openejb-client/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-client/pom.xml?rev=895326&r1=895325&r2=895326&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-client/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-client/pom.xml Sun Jan 3 02:39:14
2010
@@ -64,22 +64,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-Name>${artifactId}</Bundle-Name>
-
<Bundle-SymbolicName>${openejb.osgi.symbolic.name}</Bundle-SymbolicName>
- <Export-Package>${openejb.osgi.export}</Export-Package>
- <Import-Package>${openejb.osgi.import}</Import-Package>
- <Private-Package>${openejb.osgi.private.pkg}</Private-Package>
- <Implementation-Title>Apache OpenEJB</Implementation-Title>
-
<Implementation-Version>${project.version}</Implementation-Version>
- <Require-Bundle>${openejb.osgi.require.bundle}</Require-Bundle>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
<dependencies>
