Skip to content

Commit

Permalink
Merge IBM development contributiions. As it does not appear possible …
Browse files Browse the repository at this point in the history 
…to alter the git log messages to include jira issue numbers, the git commit hashes will be added to the jira issues.
  • Loading branch information
@djencks
djencks committed Feb 19, 2017
2 parents b8721ed + fab2a98 commit e1e6d27
Show file tree
Hide file tree
Showing 320 changed files with 20,260 additions and 13,350 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
@@ -1,5 +1,7 @@
*.i??
.project
.metadata
.idea
.classpath
.settings
target
Expand Down
69 changes: 31 additions & 38 deletions pom.xml
View file
Expand Up @@ -44,7 +44,7 @@
<antrun.version>1.1</antrun.version>
<!--<antlr.version>2.7.5</antlr.version>-->
<bcel.version>5.2</bcel.version>
<junit.version>4.5</junit.version>
<junit.version>4.12</junit.version>
<compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
<java.endorsed.dirs>${basedir}/target/classes</java.endorsed.dirs>
<compile.forked>false</compile.forked>
Expand All @@ -71,19 +71,20 @@
<packaging>pom</packaging>

<modules>
<module>yoko-core</module>
<module>yoko-osgi</module>
<module>yoko-spec-corba</module>
<module>yoko-rmi-spec</module>
<module>yoko-util</module>
<module>yoko-rmi-impl</module>
<module>yoko-osgi</module>
<module>yoko-core</module>
</modules>

<dependencyManagement>
<dependencies>
<!-- Yoko modules -->
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-core</artifactId>
<artifactId>yoko-osgi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -93,19 +94,24 @@
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-osgi</artifactId>
<artifactId>yoko-rmi-spec</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-rmi-spec</artifactId>
<artifactId>yoko-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-rmi-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-core</artifactId>
<version>${project.version}</version>
</dependency>
<!-- External dependencies -->
<dependency>
<groupId>junit</groupId>
Expand All @@ -117,16 +123,6 @@
<artifactId>org.apache.servicemix.bundles.bcel</artifactId>
<version>5.2_2</version>
</dependency>
<!--<dependency>-->
<!--<groupId>org.apache.maven</groupId>-->
<!--<artifactId>maven-plugin-api</artifactId>-->
<!--<version>${maven.version}</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.maven</groupId>-->
<!--<artifactId>maven-project</artifactId>-->
<!--<version>${maven.version}</version>-->
<!--</dependency>-->
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
Expand Down Expand Up @@ -197,7 +193,18 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<compilerArguments>
<endorseddirs>${project.build.directory}/endorsed</endorseddirs>
</compilerArguments>
</configuration>
</plugin>
</plugins>

<pluginManagement>
Expand All @@ -214,24 +221,6 @@
</dependency>
</dependencies>
</plugin>
<!--<plugin>-->
<!--<groupId>org.apache.maven.plugins</groupId>-->
<!--<artifactId>maven-surefire-plugin</artifactId>-->
<!--<configuration>-->
<!--<includes>-->
<!--<include>**/*Test.java</include>-->
<!--<include>**/*TestCase.java</include>-->
<!--</includes>-->
<!--<excludes>-->
<!--<exclude>**/*$*</exclude>-->
<!--</excludes>-->
<!--<reportFormat>brief</reportFormat>-->
<!--<useFile>false</useFile>-->
<!--<forkMode>once</forkMode>-->
<!--<childDelegation>false</childDelegation>-->
<!--<argLine>-ea</argLine>-->
<!--</configuration>-->
<!--</plugin>-->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down Expand Up @@ -260,9 +249,6 @@
<artifactId>maven-clover-plugin</artifactId>
<version>2.4</version>
</plugin>
<!--plugin>
<artifactId>maven-pmd-plugin</artifactId>
</plugin!-->
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
Expand All @@ -275,4 +261,11 @@
<url>http://svn.apache.org/viewvc/geronimo/yoko/trunk</url>
</scm>

<dependencies>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.bcel</artifactId>
<version>5.2_2</version>
</dependency>
</dependencies>
</project>
38 changes: 27 additions & 11 deletions yoko-core/pom.xml
View file
Expand Up @@ -33,7 +33,12 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.3.0</version>
<version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-osgi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -48,23 +53,32 @@
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-rmi-impl</artifactId>
<scope>test</scope>
<artifactId>yoko-util</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-osgi</artifactId>
<artifactId>yoko-rmi-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Bundle-Activator>org.apache.yoko.orb.activator.Activator</Bundle-Activator>
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Expand All @@ -90,6 +104,13 @@
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/endorsed</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-osgi</artifactId>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/endorsed</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
Expand All @@ -110,15 +131,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx128m -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
<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>

Expand Down
7 changes: 0 additions & 7 deletions yoko-core/src/main/java/org/apache/yoko/orb/CORBA/Delegate.java
View file
Expand Up @@ -1057,11 +1057,4 @@ public synchronized org.apache.yoko.orb.OB.DowncallStub _OB_getDowncallStub(
return downcallStub_;
}

public synchronized void _OB_closeConnection(boolean terminate) {
if (downcallStub_ == null) {
return;
}
downcallStub_._OB_closeConnection(terminate);
downcallStub_ = null;
}
}

0 comments on commit e1e6d27

Please sign in to comment.