geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r934468 - in /geronimo/yoko/trunk: ./ yoko-core/ yoko-osgi/ yoko-osgi/src/ yoko-osgi/src/main/ yoko-osgi/src/main/java/ yoko-osgi/src/main/java/org/ yoko-osgi/src/main/java/org/apache/ yoko-osgi/src/main/java/org/apache/yoko/ yoko-osgi/src/...
Date Thu, 15 Apr 2010 16:04:56 GMT
Author: djencks
Date: Thu Apr 15 16:04:56 2010
New Revision: 934468

URL: http://svn.apache.org/viewvc?rev=934468&view=rev
Log:
GERONIMO-5091 Move locator code to its own bundle

Added:
    geronimo/yoko/trunk/yoko-osgi/
    geronimo/yoko/trunk/yoko-osgi/pom.xml   (with props)
    geronimo/yoko/trunk/yoko-osgi/src/
    geronimo/yoko/trunk/yoko-osgi/src/main/
    geronimo/yoko/trunk/yoko-osgi/src/main/java/
    geronimo/yoko/trunk/yoko-osgi/src/main/java/org/
    geronimo/yoko/trunk/yoko-osgi/src/main/java/org/apache/
    geronimo/yoko/trunk/yoko-osgi/src/main/java/org/apache/yoko/
    geronimo/yoko/trunk/yoko-osgi/src/main/java/org/apache/yoko/osgi/
    geronimo/yoko/trunk/yoko-osgi/src/main/java/org/apache/yoko/osgi/locator/
      - copied from r934301, geronimo/yoko/trunk/yoko-rmi-impl/src/main/java/org/apache/yoko/osgi/locator/
Removed:
    geronimo/yoko/trunk/yoko-rmi-impl/src/main/java/org/apache/yoko/osgi/
Modified:
    geronimo/yoko/trunk/pom.xml
    geronimo/yoko/trunk/yoko-core/pom.xml
    geronimo/yoko/trunk/yoko-rmi-impl/pom.xml
    geronimo/yoko/trunk/yoko-rmi-spec/pom.xml

Modified: geronimo/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/pom.xml?rev=934468&r1=934467&r2=934468&view=diff
==============================================================================
--- geronimo/yoko/trunk/pom.xml (original)
+++ geronimo/yoko/trunk/pom.xml Thu Apr 15 16:04:56 2010
@@ -17,6 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
+
 <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">
 
     <parent>
@@ -84,7 +85,8 @@
         <module>yoko-spec-corba</module>
         <module>yoko-rmi-spec</module>
         <module>yoko-rmi-impl</module>
-    </modules>
+    <module>yoko-osgi</module>
+  </modules>
 
     <dependencyManagement>
         <dependencies>
@@ -101,6 +103,11 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.yoko</groupId>
+                <artifactId>yoko-osgi</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.yoko</groupId>
                 <artifactId>yoko-rmi-spec</artifactId>
                 <version>${version}</version>
             </dependency>
@@ -563,4 +570,4 @@
         <url>http://svn.apache.org/viewvc/geronimo/yoko/trunk</url>
     </scm>
 
-</project>
+</project>
\ No newline at end of file

Modified: geronimo/yoko/trunk/yoko-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-core/pom.xml?rev=934468&r1=934467&r2=934468&view=diff
==============================================================================
--- geronimo/yoko/trunk/yoko-core/pom.xml (original)
+++ geronimo/yoko/trunk/yoko-core/pom.xml Thu Apr 15 16:04:56 2010
@@ -18,154 +18,158 @@
  * under the License.
 -->
 <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>
-  <artifactId>yoko-core</artifactId>
-  <name>Apache Yoko Core</name>
-  <packaging>bundle</packaging>
-
-  <parent>
-    <groupId>org.apache.yoko</groupId>
-    <artifactId>yoko</artifactId>
-    <version>1.1-SNAPSHOT</version>
-  </parent>
-
-  <dependencies>
-    <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>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>concurrent</groupId>
-      <artifactId>concurrent</artifactId>
-      <scope>test</scope>
-    </dependency>
-
- </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.yoko</groupId>
-                  <artifactId>yoko-spec-corba</artifactId>
-                  <type>jar</type>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-     <plugin>
-       <groupId>org.apache.maven.plugins</groupId>
-       <artifactId>maven-compiler-plugin</artifactId>
-       <configuration>
-         <compilerArguments>
-           <endorseddirs>${project.build.directory}/endorsed</endorseddirs>
-         </compilerArguments>
-       </configuration>
-     </plugin>
-
-     <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>**/org/apache/yoko/*Test.java</include>
-          </includes>
-          <systemProperties>
-            <property>
-              <name>java.endorsed.dirs</name>
-              <value>${basedir}/target/endorsed</value>
-            </property>
-          </systemProperties>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>test-compile</phase>
-            <configuration>
-              <tasks>
-                <java classname="sun.rmi.rmic.Main" fork="true">
-                  <arg value="-d" />
-                  <arg value="target/test-classes" />
-                  <arg value="-classpath" />
-                  <arg value="target/test-classes" />
-                  <arg value="-iiop" />
-                  <arg value="-poa" />
-                  <arg value="-keep" />
-                  <arg value="test.rmi.SampleImpl" />
-                  <arg value="test.rmi.SampleRemoteImpl" />
-                  <classpath>
-                    <pathelement path="${java.home}/../lib/tools.jar" />
-                  </classpath>
-                </java>
-                <java classname="sun.rmi.rmic.Main" fork="true">
-                  <arg value="-d" />
-                  <arg value="target/test-classes" />
-                  <arg value="-classpath" />
-                  <arg value="target/test-classes" />
-                  <arg value="org.apache.yoko.processmanager.ProcessManager" />
-                  <arg value="org.apache.yoko.processmanager.internal.ProcessAgentImpl"
/>
-                  <classpath>
-                    <pathelement path="${java.home}/../lib/tools.jar" />
-                  </classpath>
-                </java>
-              </tasks>
-            </configuration>
-
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-clover-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>yoko-core</artifactId>
+    <name>Apache Yoko Core</name>
+    <packaging>bundle</packaging>
+
+    <parent>
+        <groupId>org.apache.yoko</groupId>
+        <artifactId>yoko</artifactId>
+        <version>1.1-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <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.yoko</groupId>
+            <artifactId>yoko-osgi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.yoko</groupId>
+                                    <artifactId>yoko-spec-corba</artifactId>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArguments>
+                        <endorseddirs>${project.build.directory}/endorsed</endorseddirs>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/org/apache/yoko/*Test.java</include>
+                    </includes>
+                    <systemProperties>
+                        <property>
+                            <name>java.endorsed.dirs</name>
+                            <value>${basedir}/target/endorsed</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>test-compile</phase>
+                        <configuration>
+                            <tasks>
+                                <java classname="sun.rmi.rmic.Main" fork="true">
+                                    <arg value="-d"/>
+                                    <arg value="target/test-classes"/>
+                                    <arg value="-classpath"/>
+                                    <arg value="target/test-classes"/>
+                                    <arg value="-iiop"/>
+                                    <arg value="-poa"/>
+                                    <arg value="-keep"/>
+                                    <arg value="test.rmi.SampleImpl"/>
+                                    <arg value="test.rmi.SampleRemoteImpl"/>
+                                    <classpath>
+                                        <pathelement path="${java.home}/../lib/tools.jar"/>
+                                    </classpath>
+                                </java>
+                                <java classname="sun.rmi.rmic.Main" fork="true">
+                                    <arg value="-d"/>
+                                    <arg value="target/test-classes"/>
+                                    <arg value="-classpath"/>
+                                    <arg value="target/test-classes"/>
+                                    <arg value="org.apache.yoko.processmanager.ProcessManager"/>
+                                    <arg value="org.apache.yoko.processmanager.internal.ProcessAgentImpl"/>
+                                    <classpath>
+                                        <pathelement path="${java.home}/../lib/tools.jar"/>
+                                    </classpath>
+                                </java>
+                            </tasks>
+                        </configuration>
+
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-clover-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-pmd-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </reporting>
 
 </project>
 

Added: geronimo/yoko/trunk/yoko-osgi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-osgi/pom.xml?rev=934468&view=auto
==============================================================================
--- geronimo/yoko/trunk/yoko-osgi/pom.xml (added)
+++ geronimo/yoko/trunk/yoko-osgi/pom.xml Thu Apr 15 16:04:56 2010
@@ -0,0 +1,38 @@
+<?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.
+* -->
+
+<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>
+        <artifactId>yoko</artifactId>
+        <groupId>org.apache.yoko</groupId>
+        <version>1.1-SNAPSHOT</version>
+    </parent>
+    <artifactId>yoko-osgi</artifactId>
+    <name>Apache Yoko osgi support</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>
+    </dependencies>
+</project>

Propchange: geronimo/yoko/trunk/yoko-osgi/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/yoko/trunk/yoko-osgi/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/yoko/trunk/yoko-osgi/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/yoko/trunk/yoko-rmi-impl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-rmi-impl/pom.xml?rev=934468&r1=934467&r2=934468&view=diff
==============================================================================
--- geronimo/yoko/trunk/yoko-rmi-impl/pom.xml (original)
+++ geronimo/yoko/trunk/yoko-rmi-impl/pom.xml Thu Apr 15 16:04:56 2010
@@ -1,3 +1,4 @@
+<?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
@@ -40,6 +41,10 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.yoko</groupId>
+            <artifactId>yoko-osgi</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.bcel</artifactId>
         </dependency>

Modified: geronimo/yoko/trunk/yoko-rmi-spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-rmi-spec/pom.xml?rev=934468&r1=934467&r2=934468&view=diff
==============================================================================
--- geronimo/yoko/trunk/yoko-rmi-spec/pom.xml (original)
+++ geronimo/yoko/trunk/yoko-rmi-spec/pom.xml Thu Apr 15 16:04:56 2010
@@ -1,3 +1,4 @@
+<?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



Mime
View raw message