[jboss-cvs] JBossAS SVN: r102828 - in projects/naming/tags: 5.0.5.Final and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 23 17:10:10 EDT 2010
Author: bstansberry at jboss.com
Date: 2010-03-23 17:10:08 -0400 (Tue, 23 Mar 2010)
New Revision: 102828
Added:
projects/naming/tags/5.0.5.Final/
projects/naming/tags/5.0.5.Final/jnpclient/pom.xml
projects/naming/tags/5.0.5.Final/jnpserver/pom.xml
projects/naming/tags/5.0.5.Final/pom.xml
Removed:
projects/naming/tags/5.0.5.Final/jnpclient/pom.xml
projects/naming/tags/5.0.5.Final/jnpserver/pom.xml
projects/naming/tags/5.0.5.Final/pom.xml
Modified:
projects/naming/tags/5.0.5.Final/jnpserver/src/main/java/org/jnp/interfaces/NamingContext.java
Log:
[maven-release-plugin] copy for tag 5.0.5.Final
Copied: projects/naming/tags/5.0.5.Final (from rev 100934, projects/naming/branches/Branch_5_0)
Deleted: projects/naming/tags/5.0.5.Final/jnpclient/pom.xml
===================================================================
--- projects/naming/branches/Branch_5_0/jnpclient/pom.xml 2010-02-13 14:30:36 UTC (rev 100934)
+++ projects/naming/tags/5.0.5.Final/jnpclient/pom.xml 2010-03-23 21:10:08 UTC (rev 102828)
@@ -1,69 +0,0 @@
-<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 -->
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>4-beta-2</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnp-client</artifactId>
- <name>JBoss Naming Client</name>
- <version>5.0.5-SNAPSHOT</version>
- <description>The JBoss Naming Client</description>
- <url>http://www.jboss.org</url>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>buildjar</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <jar jarfile="${basedir}/target/jnp-client-${project.version}.jar" update="true" manifest="${basedir}/../jnpserver/src/etc/default.mf">
- <fileset dir="${basedir}/../jnpserver/target/classes">
- <include name="org/jnp/interfaces/**" />
- <include name="org/jnp/server/NamingServer_Stub.class" />
- <include name="org/jboss/naming/**" />
- </fileset>
- <fileset file="${basedir}/../JBossORG-EULA.txt" />
- </jar>
- </tasks>
- </configuration>
- </execution>
- </executions>
- <inherited>true</inherited>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.2.10.GA</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>2.0.5.GA</version>
- </dependency>
- <!--
- The jnp-client module depends on the jnpserver module at build time
- in order to copy the classes, but not at runtime.
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnpserver</artifactId>
- <version>${project.version}</version>
- </dependency>
- -->
- </dependencies>
-</project>
Copied: projects/naming/tags/5.0.5.Final/jnpclient/pom.xml (from rev 102827, projects/naming/branches/Branch_5_0/jnpclient/pom.xml)
===================================================================
--- projects/naming/tags/5.0.5.Final/jnpclient/pom.xml (rev 0)
+++ projects/naming/tags/5.0.5.Final/jnpclient/pom.xml 2010-03-23 21:10:08 UTC (rev 102828)
@@ -0,0 +1,69 @@
+<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 -->
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>4-beta-2</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnp-client</artifactId>
+ <name>JBoss Naming Client</name>
+ <version>5.0.5.Final</version>
+ <description>The JBoss Naming Client</description>
+ <url>http://www.jboss.org</url>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>buildjar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <jar jarfile="${basedir}/target/jnp-client-${project.version}.jar" update="true" manifest="${basedir}/../jnpserver/src/etc/default.mf">
+ <fileset dir="${basedir}/../jnpserver/target/classes">
+ <include name="org/jnp/interfaces/**" />
+ <include name="org/jnp/server/NamingServer_Stub.class" />
+ <include name="org/jboss/naming/**" />
+ </fileset>
+ <fileset file="${basedir}/../JBossORG-EULA.txt" />
+ </jar>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ <inherited>true</inherited>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.2.10.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>2.0.5.GA</version>
+ </dependency>
+ <!--
+ The jnp-client module depends on the jnpserver module at build time
+ in order to copy the classes, but not at runtime.
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ -->
+ </dependencies>
+</project>
Deleted: projects/naming/tags/5.0.5.Final/jnpserver/pom.xml
===================================================================
--- projects/naming/branches/Branch_5_0/jnpserver/pom.xml 2010-02-13 14:30:36 UTC (rev 100934)
+++ projects/naming/tags/5.0.5.Final/jnpserver/pom.xml 2010-03-23 21:10:08 UTC (rev 102828)
@@ -1,118 +0,0 @@
-<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 -->
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>4-beta-2</version>
- </parent>
-
- <version>5.0.5-SNAPSHOT</version>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnpserver</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Naming Server</name>
- <url>http://www.jboss.org</url>
- <description>The JBoss JNDI Server</description>
- <scm>
- <connection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/naming/branches/Branch_5_0</connection>
- </scm>
- <!-- Properties -->
- <properties>
- <!-- compile dependencies -->
- <version.org.jboss.logging.spi>2.0.5.GA</version.org.jboss.logging.spi>
- <version.org.jboss.common.core>2.2.10.GA</version.org.jboss.common.core>
- <!-- testing dependencies -->
- <version.org.jboss.microcontainer>2.0.0.CR5</version.org.jboss.microcontainer>
- <version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
- <version.junit>4.4</version.junit>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/client.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rmic-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>rmi-compile</id>
- <goals>
- <goal>rmic</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.outputDirectory}</outputDirectory>
- <includes>
- <include>org/jnp/server/NamingServer.class</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <excludes>
- <!-- This is not a unit test -->
- <exclude>**/TestSecurityManager.java</exclude>
- <exclude>**/*$*</exclude>
- </excludes>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <systemProperties>
- <property>
- <name>xb.builder.useUnorderedSequence</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <!-- compile dependencies -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>${version.org.jboss.common.core}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.org.jboss.logging.spi}</version>
- </dependency>
-
- <!-- test dependencing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${version.org.jboss.microcontainer}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <version>${version.org.jboss.test}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
Copied: projects/naming/tags/5.0.5.Final/jnpserver/pom.xml (from rev 102827, projects/naming/branches/Branch_5_0/jnpserver/pom.xml)
===================================================================
--- projects/naming/tags/5.0.5.Final/jnpserver/pom.xml (rev 0)
+++ projects/naming/tags/5.0.5.Final/jnpserver/pom.xml 2010-03-23 21:10:08 UTC (rev 102828)
@@ -0,0 +1,118 @@
+<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 -->
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>4-beta-2</version>
+ </parent>
+
+ <version>5.0.5.Final</version>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Naming Server</name>
+ <url>http://www.jboss.org</url>
+ <description>The JBoss JNDI Server</description>
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/naming/tags/5.0.5.Final</connection>
+ </scm>
+ <!-- Properties -->
+ <properties>
+ <!-- compile dependencies -->
+ <version.org.jboss.logging.spi>2.0.5.GA</version.org.jboss.logging.spi>
+ <version.org.jboss.common.core>2.2.10.GA</version.org.jboss.common.core>
+ <!-- testing dependencies -->
+ <version.org.jboss.microcontainer>2.0.0.CR5</version.org.jboss.microcontainer>
+ <version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
+ <version.junit>4.4</version.junit>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/client.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rmic-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>rmi-compile</id>
+ <goals>
+ <goal>rmic</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ <includes>
+ <include>org/jnp/server/NamingServer.class</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <excludes>
+ <!-- This is not a unit test -->
+ <exclude>**/TestSecurityManager.java</exclude>
+ <exclude>**/*$*</exclude>
+ </excludes>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <systemProperties>
+ <property>
+ <name>xb.builder.useUnorderedSequence</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <!-- compile dependencies -->
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>${version.org.jboss.common.core}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>${version.org.jboss.logging.spi}</version>
+ </dependency>
+
+ <!-- test dependencing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${version.org.jboss.microcontainer}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>${version.org.jboss.test}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: projects/naming/tags/5.0.5.Final/jnpserver/src/main/java/org/jnp/interfaces/NamingContext.java
===================================================================
--- projects/naming/branches/Branch_5_0/jnpserver/src/main/java/org/jnp/interfaces/NamingContext.java 2010-02-13 14:30:36 UTC (rev 100934)
+++ projects/naming/tags/5.0.5.Final/jnpserver/src/main/java/org/jnp/interfaces/NamingContext.java 2010-03-23 21:10:08 UTC (rev 102828)
@@ -1621,6 +1621,11 @@
{
InetSocketAddress localAddr = new InetSocketAddress(localAddrStr, localPort);
s = new MulticastSocket(localAddr);
+ InetAddress sendAddress = localAddr.getAddress();
+ if (sendAddress.isAnyLocalAddress() == false)
+ {
+ s.setInterface(sendAddress);
+ }
}
else
{
@@ -1630,7 +1635,10 @@
s.setTimeToLive(ttl);
if(log.isTraceEnabled())
log.trace("TTL on multicast discovery socket is " + ttl);
- s.joinGroup(iaGroup);
+ // BES 2010/02/13 There is no need to join the group to send to it.
+ // Joining just raises the (slight) possibility of incorrectly receiving
+ // someone else's multicast discovery message instead of unicast reply
+// s.joinGroup(iaGroup);
if (trace)
log.trace("MulticastSocket: " + s);
DatagramPacket packet;
Deleted: projects/naming/tags/5.0.5.Final/pom.xml
===================================================================
--- projects/naming/branches/Branch_5_0/pom.xml 2010-02-13 14:30:36 UTC (rev 100934)
+++ projects/naming/tags/5.0.5.Final/pom.xml 2010-03-23 21:10:08 UTC (rev 102828)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- The parent maven for the jndi naming server project
-
- This pom aggregates the subproject pom
-
- To build this project maven 2 should be installed and in the system path. From the command line
- run "mvn" from the build directory and "install" will be used as the default goal. In order to use
- the "deploy" goal, the mvn.cvs.root should be specified in settings.xml.
--->
-<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>
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>3</version>
- </parent>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jboss-naming-build</artifactId>
- <version>5.0.5-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>JBoss Naming Build</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>The JBoss JNDI name server implementation</description>
- <scm>
- <connection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/naming/branches/Branch_5_0</connection>
- </scm>
-
- <modules>
- <module>jnpserver</module>
- <module>jnpclient</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/jbossas/projects/naming/tags</tagBase>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
Copied: projects/naming/tags/5.0.5.Final/pom.xml (from rev 102827, projects/naming/branches/Branch_5_0/pom.xml)
===================================================================
--- projects/naming/tags/5.0.5.Final/pom.xml (rev 0)
+++ projects/naming/tags/5.0.5.Final/pom.xml 2010-03-23 21:10:08 UTC (rev 102828)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ The parent maven for the jndi naming server project
+
+ This pom aggregates the subproject pom
+
+ To build this project maven 2 should be installed and in the system path. From the command line
+ run "mvn" from the build directory and "install" will be used as the default goal. In order to use
+ the "deploy" goal, the mvn.cvs.root should be specified in settings.xml.
+-->
+<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>
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>3</version>
+ </parent>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jboss-naming-build</artifactId>
+ <version>5.0.5.Final</version>
+ <packaging>pom</packaging>
+ <name>JBoss Naming Build</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>The JBoss JNDI name server implementation</description>
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/naming/tags/5.0.5.Final</connection>
+ </scm>
+
+ <modules>
+ <module>jnpserver</module>
+ <module>jnpclient</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/jbossas/projects/naming/tags</tagBase>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
More information about the jboss-cvs-commits
mailing list