You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by ah...@apache.org on 2006/08/15 12:00:56 UTC
svn commit: r431579 - in /incubator/yoko/trunk: core/pom.xml
core/src/main/java/org/omg/ pom.xml
yoko-spec-corba/src/main/idl/CosNaming.idl
Author: ahj
Date: Tue Aug 15 05:00:56 2006
New Revision: 431579
URL: http://svn.apache.org/viewvc?rev=431579&view=rev
Log:
YOKO-147: Build and test using the new spec module
Removed:
incubator/yoko/trunk/core/src/main/java/org/omg/
Modified:
incubator/yoko/trunk/core/pom.xml
incubator/yoko/trunk/pom.xml
incubator/yoko/trunk/yoko-spec-corba/src/main/idl/CosNaming.idl
Modified: incubator/yoko/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/pom.xml?rev=431579&r1=431578&r2=431579&view=diff
==============================================================================
--- incubator/yoko/trunk/core/pom.xml (original)
+++ incubator/yoko/trunk/core/pom.xml Tue Aug 15 05:00:56 2006
@@ -12,7 +12,11 @@
<version>1.0-incubating-M1-SNAPSHOT</version>
</parent>
- <dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-spec-corba</artifactId>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -26,13 +30,36 @@
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
- <plugins>
- <plugin>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-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-jar-plugin</artifactId>
<executions>
@@ -43,7 +70,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -52,7 +79,7 @@
<source>1.4</source>
<target>1.4</target>
<compilerArguments>
- <endorseddirs>${basedir}/target</endorseddirs>
+ <endorseddirs>${project.build.directory}/endorsed</endorseddirs>
</compilerArguments>
</configuration>
</plugin>
@@ -67,7 +94,7 @@
<systemProperties>
<property>
<name>java.endorsed.dirs</name>
- <value>${basedir}/target</value>
+ <value>${basedir}/target/endorsed</value>
</property>
</systemProperties>
</configuration>
Modified: incubator/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/pom.xml?rev=431579&r1=431578&r2=431579&view=diff
==============================================================================
--- incubator/yoko/trunk/pom.xml (original)
+++ incubator/yoko/trunk/pom.xml Tue Aug 15 05:00:56 2006
@@ -275,6 +275,11 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.1.3</version>
Modified: incubator/yoko/trunk/yoko-spec-corba/src/main/idl/CosNaming.idl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/src/main/idl/CosNaming.idl?rev=431579&r1=431578&r2=431579&view=diff
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/src/main/idl/CosNaming.idl (original)
+++ incubator/yoko/trunk/yoko-spec-corba/src/main/idl/CosNaming.idl Tue Aug 15 05:00:56 2006
@@ -362,17 +362,17 @@
CannotProceed,
InvalidName);
- /** Not implemented yet!
- void destroy()
- raises(NotEmpty);
+ /**
* The destroy operation deletes a naming context. If the naming
* context contains bindings, the NotEmpty exception is raised.
*
* @exception org.omg.CosNaming.NamingContextPackage.NotEmpty Indicates that the Naming Context contains bindings.
*/
+ void destroy()
+ raises(NotEmpty);
};
/**
- * A naming context extension is an extenrion to naming context that contains a set of name bindings in
+ * A naming context extension is an extension to naming context that contains a set of name bindings in
* which each name is unique. Different names can be bound to an object
* in the same or different contexts at the same time. <p>
*