Menu
▾
▴
openorb-commits — A moderate volume list to track updates to the CVS repository.
You can subscribe to this list here.
| 2002 |
Jan
(887) |
Feb
(1041) |
Mar
(429) |
Apr
(147) |
May
(358) |
Jun
(378) |
Jul
(484) |
Aug
(501) |
Sep
(259) |
Oct
(934) |
Nov
(235) |
Dec
(108) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(287) |
Feb
(571) |
Mar
(939) |
Apr
(282) |
May
(71) |
Jun
(4) |
Jul
|
Aug
(10) |
Sep
|
Oct
(121) |
Nov
(141) |
Dec
(32) |
| 2004 |
Jan
(119) |
Feb
(697) |
Mar
(12) |
Apr
(23) |
May
(34) |
Jun
(44) |
Jul
(270) |
Aug
(62) |
Sep
(4) |
Oct
(2) |
Nov
(35) |
Dec
(18) |
| 2005 |
Jan
(37) |
Feb
(7) |
Mar
(49) |
Apr
(1) |
May
(6) |
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2007 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Michael R. <mr...@us...> - 2002-01-10 23:57:36
|
Update of /cvsroot/openorb/PropertyService In directory usw-pr-cvs1:/tmp/cvs-serv13258 Modified Files: build.sh test.bat test.sh Log Message: main jar was overwritten by examples jar build.sh and test.sh, bugs fixed Index: build.sh =================================================================== RCS file: /cvsroot/openorb/PropertyService/build.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- build.sh 2002/01/09 12:44:37 1.1.1.1 +++ build.sh 2002/01/10 23:57:33 1.2 @@ -1,34 +1,31 @@ -#!/bin/sh -# $Id$ - -# -# Set up the environment -# -if [ -z "$JAVA_HOME" ] ; then - JAVAC=`which java` - if [ -z "$JAVAC" ] ; then - echo "Cannot find JAVA. Please set your PATH." - exit 1 - fi - JAVA_BIN=`dirname $JAVAC` - JAVA_HOME=$JAVA_BIN/.. -fi - -JAVAC=$JAVA_HOME/bin/java - -# -# Concatenate all the libraries in the lib directory and append -# it to the classpath environment variable -# -CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH - -# Change the attributs for the antRun file - -chmod u+x lib/bin/antRun - -# -# Execute the build tool passing the build.xml file -# -$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml +#!/bin/sh +# $Id$ + +# +# Set up the environment +# +if [ -z "$JAVA_HOME" ] ; then + JAVAC=`which java` + if [ -z "$JAVAC" ] ; then + echo "Cannot find JAVA. Please set your PATH." + exit 1 + fi + JAVA_BIN=`dirname $JAVAC` + JAVA_HOME=$JAVA_BIN/.. +fi + +JAVAC=$JAVA_HOME/bin/java + +# +# Concatenate all the libraries in the lib directory and append +# it to the classpath environment variable +# +CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH + +# +# Execute the build tool passing the build.xml file +# +$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml + Index: test.bat =================================================================== RCS file: /cvsroot/openorb/PropertyService/test.bat,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- test.bat 2002/01/09 12:44:37 1.1.1.1 +++ test.bat 2002/01/10 23:57:33 1.2 @@ -1,9 +1,10 @@ @echo off REM $Id$ set JAVA=%JAVA_HOME%\bin\java +set JAVA_FLAGS="-Dorg.omg.CORBA.ORBClass=org.openorb.CORBA.ORB -Dorg.omg.CORBA.ORBSingletonClass=org.openorb.CORBA.ORBSingleton" set cp=%CLASSPATH% for %%i in (dist\*.jar) do call cp.bat %%i for %%i in (..\OpenORB\dist\*.jar) do call cp.bat %%i -%JAVA% -classpath %CP% org.openorb.property.test.PropertyServiceTest +%JAVA% %JAVA_FLAGS% -classpath %CP% org.openorb.property.test.PropertyServiceTest Index: test.sh =================================================================== RCS file: /cvsroot/openorb/PropertyService/test.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- test.sh 2002/01/09 12:44:37 1.1.1.1 +++ test.sh 2002/01/10 23:57:33 1.2 @@ -1,31 +1,32 @@ -#!/bin/sh -# $Id$ - -# -# Set up the environment -# -if [ -z "$JAVA_HOME" ] ; then - JAVAC=`which java` - if [ -z "$JAVAC" ] ; then - echo "Cannot find JAVA. Please set your PATH." - exit 1 - fi - JAVA_BIN=`dirname $JAVAC` - JAVA_HOME=$JAVA_BIN/.. -fi - -JAVAC=$JAVA_HOME/bin/java - -# -# Concatenate all the libraries in the lib directory and append -# it to the classpath environment variable -# -CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH -CLASSPATH=`echo dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH - - -# -# Execute the build tool passing the build.xml file -# -$JAVAC -cp $CLASSPATH org.openorb.property.test.PropertyServiceTest +#!/bin/sh +# $Id$ + +# +# Set up the environment +# +if [ -z "$JAVA_HOME" ] ; then + JAVAC=`which java` + if [ -z "$JAVAC" ] ; then + echo "Cannot find JAVA. Please set your PATH." + exit 1 + fi + JAVA_BIN=`dirname $JAVAC` + JAVA_HOME=$JAVA_BIN/.. +fi + +JAVAC=$JAVA_HOME/bin/java +JAVA_FLAGS="-Dorg.omg.CORBA.ORBClass=org.openorb.CORBA.ORB -Dorg.omg.CORBA.ORBSingletonClass=org.openorb.CORBA.ORBSingleton" + +# +# Concatenate all the libraries in the lib directory and append +# it to the classpath environment variable +# +CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH +CLASSPATH=`echo dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH + +# +# Execute the build tool passing the build.xml file +# +$JAVAC $JAVA_FLAGS -cp $CLASSPATH org.openorb.property.test.PropertyServiceTest + |
|
From: Michael R. <mr...@us...> - 2002-01-10 23:57:36
|
Update of /cvsroot/openorb/PropertyService/src
In directory usw-pr-cvs1:/tmp/cvs-serv13258/src
Modified Files:
build.xml
Log Message:
main jar was overwritten by examples jar
build.sh and test.sh, bugs fixed
Index: build.xml
===================================================================
RCS file: /cvsroot/openorb/PropertyService/src/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- build.xml 2002/01/10 19:12:33 1.2
+++ build.xml 2002/01/10 23:57:33 1.3
@@ -113,9 +113,9 @@
destdir="${build}/test"
classpath="${classpath}" debug="on" />
- <delete file="${dist}/${property-test-jar}" />
+ <delete file="${dist}/${property-tests-jar}" />
- <jar jarfile="${dist}/${property-test-jar}"
+ <jar jarfile="${dist}/${property-tests-jar}"
basedir="${build}/test" />
</target>
@@ -161,8 +161,8 @@
</target>
<target name="jar-all" depends="jar,examples,test" >
- <delete file="${dist}/${property-main-jar}" />
- <jar jarfile="${dist}/${property-main-jar}"
+ <delete file="${dist}/${property-examples-jar}" />
+ <jar jarfile="${dist}/${property-examples-jar}"
basedir="${build}/examples" />
@@ -249,8 +249,8 @@
tofile="${bin}/lib/${property-main-jar}" />
<copy file="${dist}/${property-examples-jar}"
tofile="${bin}/lib/${property-examples-jar}" />
- <copy file="${dist}/${property-test-jar}"
- tofile="${bin}/lib/${property-test-jar}" />
+ <copy file="${dist}/${property-tests-jar}"
+ tofile="${bin}/lib/${property-tests-jar}" />
<copy file="${dist}/PropertyService.pdf" tofile="${bin}/doc/PropertyService.pdf" />
<copy todir="${bin}/idl" >
<fileset dir="${idl}">
|
|
From: Michael R. <mr...@us...> - 2002-01-10 23:32:33
|
Update of /cvsroot/openorb/TradingService In directory usw-pr-cvs1:/tmp/cvs-serv5736 Modified Files: build.sh Log Message: Fixed a bug in build.sh. Index: build.sh =================================================================== RCS file: /cvsroot/openorb/TradingService/build.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- build.sh 2002/01/10 20:47:20 1.3 +++ build.sh 2002/01/10 23:32:30 1.4 @@ -1,37 +1,34 @@ -#!/bin/sh -# $Id$ - -# -# Set up the environment -# -if [ -z "$JAVA_HOME" ] ; then - JAVAC=`which java` - if [ -z "$JAVAC" ] ; then - echo "Cannot find JAVA. Please set your PATH." - exit 1 - fi - JAVA_BIN=`dirname $JAVAC` - JAVA_HOME=$JAVA_BIN/.. -fi - -JAVAC=$JAVA_HOME/bin/java - -# -# Concatenate all the libraries in the lib directory and append -# it to the classpath environment variable -# -CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../TransactionService/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../PersistentStateService/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../ManagementBoard/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH - -# Change the attributs for the antRun file - -chmod u+x lib/bin/antRun - -# -# Execute the build tool passing the build.xml file -# -$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml +#!/bin/sh +# $Id$ + +# +# Set up the environment +# +if [ -z "$JAVA_HOME" ] ; then + JAVAC=`which java` + if [ -z "$JAVAC" ] ; then + echo "Cannot find JAVA. Please set your PATH." + exit 1 + fi + JAVA_BIN=`dirname $JAVAC` + JAVA_HOME=$JAVA_BIN/.. +fi + +JAVAC=$JAVA_HOME/bin/java + +# +# Concatenate all the libraries in the lib directory and append +# it to the classpath environment variable +# +CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../TransactionService/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../PersistentStateService/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../ManagementBoard/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH + +# +# Execute the build tool passing the build.xml file +# +$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml + |
|
From: Michael R. <mr...@us...> - 2002-01-10 23:25:12
|
Update of /cvsroot/openorb/TimeService In directory usw-pr-cvs1:/tmp/cvs-serv2492 Modified Files: build.sh Log Message: Fixed a bug in build.sh. Index: build.sh =================================================================== RCS file: /cvsroot/openorb/TimeService/build.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- build.sh 2002/01/10 09:01:30 1.2 +++ build.sh 2002/01/10 23:25:08 1.3 @@ -1,35 +1,32 @@ -#!/bin/sh -# $Id$ - -# -# Set up the environment -# -if [ -z "$JAVA_HOME" ] ; then - JAVAC=`which java` - if [ -z "$JAVAC" ] ; then - echo "Cannot find JAVA. Please set your PATH." - exit 1 - fi - JAVA_BIN=`dirname $JAVAC` - JAVA_HOME=$JAVA_BIN/.. -fi - -JAVAC=$JAVA_HOME/bin/java - -# -# Concatenate all the libraries in the lib directory and append -# it to the classpath environment variable -# -CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../EventService/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH - -# Change the attributs for the antRun file - -chmod u+x lib/bin/antRun - -# -# Execute the build tool passing the build.xml file -# -$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml +#!/bin/sh +# $Id$ + +# +# Set up the environment +# +if [ -z "$JAVA_HOME" ] ; then + JAVAC=`which java` + if [ -z "$JAVAC" ] ; then + echo "Cannot find JAVA. Please set your PATH." + exit 1 + fi + JAVA_BIN=`dirname $JAVAC` + JAVA_HOME=$JAVA_BIN/.. +fi + +JAVAC=$JAVA_HOME/bin/java + +# +# Concatenate all the libraries in the lib directory and append +# it to the classpath environment variable +# +CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../EventService/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH + +# +# Execute the build tool passing the build.xml file +# +$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml + |
|
From: Michael R. <mr...@us...> - 2002-01-10 23:22:00
|
Update of /cvsroot/openorb/NamingService In directory usw-pr-cvs1:/tmp/cvs-serv1243 Modified Files: build.sh Log Message: Fixed a bug in build.sh. Index: build.sh =================================================================== RCS file: /cvsroot/openorb/NamingService/build.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- build.sh 2002/01/10 20:47:20 1.3 +++ build.sh 2002/01/10 23:21:57 1.4 @@ -1,37 +1,34 @@ -#!/bin/sh -# $Id$ - -# -# Set up the environment -# -if [ -z "$JAVA_HOME" ] ; then - JAVAC=`which java` - if [ -z "$JAVAC" ] ; then - echo "Cannot find JAVA. Please set your PATH." - exit 1 - fi - JAVA_BIN=`dirname $JAVAC` - JAVA_HOME=$JAVA_BIN/.. -fi - -JAVAC=$JAVA_HOME/bin/java - -# -# Concatenate all the libraries in the lib directory and append -# it to the classpath environment variable -# -CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../TransactionService/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../PersistentStateService/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../ManagementBoard/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH - -# Change the attributs for the antRun file - -chmod u+x lib/bin/antRun - -# -# Execute the build tool passing the build.xml file -# -$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml +#!/bin/sh +# $Id$ + +# +# Set up the environment +# +if [ -z "$JAVA_HOME" ] ; then + JAVAC=`which java` + if [ -z "$JAVAC" ] ; then + echo "Cannot find JAVA. Please set your PATH." + exit 1 + fi + JAVA_BIN=`dirname $JAVAC` + JAVA_HOME=$JAVA_BIN/.. +fi + +JAVAC=$JAVA_HOME/bin/java + +# +# Concatenate all the libraries in the lib directory and append +# it to the classpath environment variable +# +CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../TransactionService/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../PersistentStateService/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../ManagementBoard/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH + +# +# Execute the build tool passing the build.xml file +# +$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml + |
|
From: Michael R. <mr...@us...> - 2002-01-10 23:18:06
|
Update of /cvsroot/openorb/PersistentStateService In directory usw-pr-cvs1:/tmp/cvs-serv32206 Modified Files: build.sh Log Message: Fixed a bug in build.sh. Index: build.sh =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/build.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- build.sh 2002/01/10 09:01:30 1.2 +++ build.sh 2002/01/10 23:18:04 1.3 @@ -1,35 +1,32 @@ -#!/bin/sh -# $Id$ - -# -# Set up the environment -# -if [ -z "$JAVA_HOME" ] ; then - JAVAC=`which java` - if [ -z "$JAVAC" ] ; then - echo "Cannot find JAVA. Please set your PATH." - exit 1 - fi - JAVA_BIN=`dirname $JAVAC` - JAVA_HOME=$JAVA_BIN/.. -fi - -JAVAC=$JAVA_HOME/bin/java - -# -# Concatenate all the libraries in the lib directory and append -# it to the classpath environment variable -# -CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../TransactionService/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH - -# Change the attributs for the antRun file - -chmod u+x lib/bin/antRun - -# -# Execute the build tool passing the build.xml file -# -$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml +#!/bin/sh +# $Id$ + +# +# Set up the environment +# +if [ -z "$JAVA_HOME" ] ; then + JAVAC=`which java` + if [ -z "$JAVAC" ] ; then + echo "Cannot find JAVA. Please set your PATH." + exit 1 + fi + JAVA_BIN=`dirname $JAVAC` + JAVA_HOME=$JAVA_BIN/.. +fi + +JAVAC=$JAVA_HOME/bin/java + +# +# Concatenate all the libraries in the lib directory and append +# it to the classpath environment variable +# +CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../TransactionService/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH + +# +# Execute the build tool passing the build.xml file +# +$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml + |
|
From: Michael R. <mr...@us...> - 2002-01-10 23:17:30
|
Update of /cvsroot/openorb/TransactionService In directory usw-pr-cvs1:/tmp/cvs-serv32025 Modified Files: build.sh Log Message: Fixed a bug in build.sh. Index: build.sh =================================================================== RCS file: /cvsroot/openorb/TransactionService/build.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- build.sh 2002/01/10 09:01:30 1.2 +++ build.sh 2002/01/10 23:17:27 1.3 @@ -1,34 +1,31 @@ -#!/bin/sh -# $Id$ - -# -# Set up the environment -# -if [ -z "$JAVA_HOME" ] ; then - JAVAC=`which java` - if [ -z "$JAVAC" ] ; then - echo "Cannot find JAVA. Please set your PATH." - exit 1 - fi - JAVA_BIN=`dirname $JAVAC` - JAVA_HOME=$JAVA_BIN/.. -fi - -JAVAC=$JAVA_HOME/bin/java - -# -# Concatenate all the libraries in the lib directory and append -# it to the classpath environment variable -# -CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH - -# Change the attributs for the antRun file - -chmod u+x lib/bin/antRun - -# -# Execute the build tool passing the build.xml file -# -$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml +#!/bin/sh +# $Id$ + +# +# Set up the environment +# +if [ -z "$JAVA_HOME" ] ; then + JAVAC=`which java` + if [ -z "$JAVAC" ] ; then + echo "Cannot find JAVA. Please set your PATH." + exit 1 + fi + JAVA_BIN=`dirname $JAVAC` + JAVA_HOME=$JAVA_BIN/.. +fi + +JAVAC=$JAVA_HOME/bin/java + +# +# Concatenate all the libraries in the lib directory and append +# it to the classpath environment variable +# +CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH + +# +# Execute the build tool passing the build.xml file +# +$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml + |
|
From: Michael R. <mr...@us...> - 2002-01-10 23:12:56
|
Update of /cvsroot/openorb/ManagementBoard In directory usw-pr-cvs1:/tmp/cvs-serv30622 Modified Files: build.sh Log Message: Fixed a bug in build.sh. Index: build.sh =================================================================== RCS file: /cvsroot/openorb/ManagementBoard/build.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- build.sh 2002/01/10 09:01:29 1.2 +++ build.sh 2002/01/10 23:12:53 1.3 @@ -1,34 +1,31 @@ -#!/bin/sh -# $Id$ - -# -# Set up the environment -# -if [ -z "$JAVA_HOME" ] ; then - JAVAC=`which java` - if [ -z "$JAVAC" ] ; then - echo "Cannot find JAVA. Please set your PATH." - exit 1 - fi - JAVA_BIN=`dirname $JAVAC` - JAVA_HOME=$JAVA_BIN/.. -fi - -JAVAC=$JAVA_HOME/bin/java - -# -# Concatenate all the libraries in the lib directory and append -# it to the classpath environment variable -# -CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH - -# Change the attributs for the antRun file - -chmod u+x lib/bin/antRun - -# -# Execute the build tool passing the build.xml file -# -$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml +#!/bin/sh +# $Id$ + +# +# Set up the environment +# +if [ -z "$JAVA_HOME" ] ; then + JAVAC=`which java` + if [ -z "$JAVAC" ] ; then + echo "Cannot find JAVA. Please set your PATH." + exit 1 + fi + JAVA_BIN=`dirname $JAVAC` + JAVA_HOME=$JAVA_BIN/.. +fi + +JAVAC=$JAVA_HOME/bin/java + +# +# Concatenate all the libraries in the lib directory and append +# it to the classpath environment variable +# +CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH + +# +# Execute the build tool passing the build.xml file +# +$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml + |
|
From: Michael R. <mr...@us...> - 2002-01-10 23:10:51
|
Update of /cvsroot/openorb/EventService In directory usw-pr-cvs1:/tmp/cvs-serv29711 Modified Files: build.sh Log Message: Fixed a bug in build.sh. Index: build.sh =================================================================== RCS file: /cvsroot/openorb/EventService/build.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- build.sh 2002/01/10 09:01:29 1.2 +++ build.sh 2002/01/10 23:10:43 1.3 @@ -1,34 +1,31 @@ -#!/bin/sh -# $Id$ - -# -# Set up the environment -# -if [ -z "$JAVA_HOME" ] ; then - JAVAC=`which java` - if [ -z "$JAVAC" ] ; then - echo "Cannot find JAVA. Please set your PATH." - exit 1 - fi - JAVA_BIN=`dirname $JAVAC` - JAVA_HOME=$JAVA_BIN/.. -fi - -JAVAC=$JAVA_HOME/bin/java - -# -# Concatenate all the libraries in the lib directory and append -# it to the classpath environment variable -# -CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH - -# Change the attributs for the antRun file - -chmod u+x lib/bin/antRun - -# -# Execute the build tool passing the build.xml file -# -$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml +#!/bin/sh +# $Id$ + +# +# Set up the environment +# +if [ -z "$JAVA_HOME" ] ; then + JAVAC=`which java` + if [ -z "$JAVAC" ] ; then + echo "Cannot find JAVA. Please set your PATH." + exit 1 + fi + JAVA_BIN=`dirname $JAVAC` + JAVA_HOME=$JAVA_BIN/.. +fi + +JAVAC=$JAVA_HOME/bin/java + +# +# Concatenate all the libraries in the lib directory and append +# it to the classpath environment variable +# +CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH + +# +# Execute the build tool passing the build.xml file +# +$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml + |
|
From: Michael R. <mr...@us...> - 2002-01-10 23:06:48
|
Update of /cvsroot/openorb/ConcurrencyControlService/src/test/org/openorb/ccs/test
In directory usw-pr-cvs1:/tmp/cvs-serv27066/src/test/org/openorb/ccs/test
Added Files:
CCSTest.java
Log Message:
#501914: Removed the sub sir: src
Fixed several problems with the bash scripts.
--- NEW FILE: CCSTest.java ---
/**
* Redistribution and use of this software and associated
* documentation ("Software"), with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain copyright statements
* and notices. Redistributions must also contain a copy of this
* document.
*
* 2. Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
*
* 3. The name "Exolab" must not be used to endorse or promote
* products derived from this Software without prior written
* permission of Intalio Inc. For written permission, please
* contact in...@ex....
*
* 4. Products derived from this Software may not be called "Exolab"
* nor may "Exolab" appear in their names without prior written
* permission of Intalio Inc. Exolab is a registered trademark of
* Intalio Inc.
*
* 5. Due credit should be given to the Exolab Project
* (http://www.exolab.org/).
*
* THIS SOFTWARE IS PROVIDED BY INTALIO AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTALIO OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* Copyright 2000 (C) Intalio Inc. All Rights Reserved.
*
* $Id: CCSTest.java,v 1.1 2002/01/10 23:06:43 mrumpf Exp $
*
* Date Author Changes
* Sept 2000 Marina DANIEL Created
*/
package org.openorb.ccs.test;
import java.util.*;
import org.omg.CosConcurrencyControl.*;
import org.omg.PortableServer.POA;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.Test;
/**
* @author <a href="mailto:md...@in...">Marina Daniel <mailto:md...@in...></a>
* @author <a href="mailto:om...@in...">Olivier Modica <mailto:om...@in...></a>
* @version $Revision: 1.1 $ $Date: 2002/01/10 23:06:43 $
*/
public class CCSTest extends TestCase {
private org.omg.CORBA.ORB orb;
private org.openorb.util.ContextUtilities context_utilities;
private org.openorb.ccs.LockSetFactory lockSetFactory;
private Thread serverThread;
private Vector locks = new Vector();
private Hashtable resourceLock = new Hashtable();
private static final Object[] modes = {
"READ",
"WRITE",
"UPGRADE",
"INTENTION READ",
"INTENTION WRITE"
};
public boolean verbose = false;
public CCSTest(String name) {
super(name);
}
public void setUp() {
try
{
super.setUp();
String [] args = new String[0];
orb = org.omg.CORBA.ORB.init(args, null);
POA rootPOA = (POA)orb.resolve_initial_references("RootPOA");
rootPOA.the_POAManager().activate();
lockSetFactory = org.openorb.ccs.LockSetFactoryHelper.narrow((new org.openorb.ccs.kernel.LockSetFactory())._this(orb));
serverThread = new Thread(new Runnable() {
public void run()
{
try { orb.run(); }
catch(Exception ex){}
}
});
serverThread.start();
}
catch(Exception e) {e.printStackTrace();}
}
public void tearDown() {
orb.shutdown(true);
orb = null;
try {
serverThread.join(1000);
}
catch(InterruptedException ex) {}
}
public void testLocks() {
try {
// READ mode
if(verbose) System.out.println("lock R1 in READ mode");
lock("R1", 0);
assert("READ lock should have been allowed", trylock("R1",0));
if(verbose) System.out.println("READ lock is allowed");
assert("WRITE lock should not have been allowed", !trylock ("R1", 1));
if(verbose) System.out.println("WRITE lock is not allowed");
assert("UPGRADE lock should have been allowed", trylock ("R1", 2));
if(verbose) System.out.println("UPGRADE lock is allowed");
assert("INTENTION READ lock should have been allowed", trylock ("R1", 3));
if(verbose) System.out.println("INTENTION READ lock is allowed");
assert("INTENTION WRITE lock should not have been allowed", !trylock("R1", 4));
if(verbose) System.out.println("INTENTION WRITE is not allowed");
// WRITE Mode
if(verbose) System.out.println("\n change R1 lock from READ to WRITE");
changeLock("R1", 1);
assert("READ lock should not have been allowed", !trylock("R1",0));
if(verbose) System.out.println("READ lock is not allowed");
assert("WRITE lock should not have been allowed", !trylock ("R1", 1));
if(verbose) System.out.println("WRITE lock is not allowed");
assert("UPGRADE lock should not have been allowed", !trylock ("R1", 2));
if(verbose) System.out.println("UPGRADE lock is not allowed");
assert("INTENTION READ lock should not have been allowed", !trylock ("R1", 3));
if(verbose) System.out.println("INTENTION READ lock is not allowed");
assert("INTENTION WRITE lock should not have been allowed", !trylock("R1", 4));
if(verbose) System.out.println("INTENTION WRITE is not allowed");
// UPGRADE Mode
if(verbose) System.out.println("\n change R1 lock from WRITE to UPGRADE");
changeLock("R1", 2);
assert("READ lock should have been allowed", trylock("R1",0));
if(verbose) System.out.println("READ lock is allowed");
assert("WRITE lock should not have been allowed", !trylock ("R1", 1));
if(verbose) System.out.println("WRITE lock is not allowed");
assert("UPGRADE lock should not have been allowed", !trylock ("R1", 2));
if(verbose) System.out.println("UPGRADE lock is not allowed");
assert("INTENTION READ lock should have been allowed", trylock ("R1", 3));
if(verbose) System.out.println("INTENTION READ lock is allowed");
assert("INTENTION WRITE lock should not have been allowed", !trylock("R1", 4));
if(verbose) System.out.println("INTENTION WRITE is not allowed");
// INTENTION READ Mode
if(verbose) System.out.println("unlock R1 mode UPGRADE");
unlock("R1", 2);
if(verbose) System.out.println("lock R1 mode INTENTION READ");
lock("R1", 3);
assert("READ lock should have been allowed", trylock("R1",0));
if(verbose) System.out.println("READ lock is allowed");
assert("WRITE lock should not have been allowed", !trylock ("R1", 1));
if(verbose) System.out.println("WRITE lock is not allowed");
assert("UPGRADE lock should have been allowed", trylock ("R1", 2));
if(verbose) System.out.println("UPGRADE lock is allowed");
assert("INTENTION READ lock should have been allowed",trylock ("R1", 3));
if(verbose) System.out.println("INTENTION READ lock is allowed");
assert("INTENTION WRITE lock should have been allowed", trylock("R1", 4));
if(verbose) System.out.println("INTENTION WRITE is allowed");
// INTENTION WRITE Mode
if(verbose) System.out.println("change R1 lock from INTENTION READ to INTENTION WRITE");
changeLock("R1", 4);
assert("READ lock should not have been allowed", !trylock("R1",0));
if(verbose) System.out.println("READ lock is not allowed");
assert("WRITE lock should not have been allowed", !trylock ("R1", 1));
if(verbose) System.out.println("WRITE lock is not allowed");
assert("UPGRADE lock should not have been allowed", !trylock ("R1", 2));
if(verbose) System.out.println("UPGRADE lock is not allowed");
assert("INTENTION READ lock should have been allowed", trylock ("R1", 3));
if(verbose) System.out.println("INTENTION READ lock is allowed");
assert("INTENTION WRITE lock should have been allowed", trylock("R1", 4));
if(verbose) System.out.println("INTENTION WRITE is allowed");
unlock("R1", 4);
}
catch(Exception ex) { ex.printStackTrace(); fail(ex.toString()); }
}
/**
* lock the resource with the lock mode selection
* @param resourceName the resource to lock
* @param selected_index the selected lock mode
*/
private void lock(String resourceName, int selected_index)
{
if (resourceName.equals(""))
return;
if (!resourceLock.containsKey(resourceName))
{
try
{
org.omg.CosConcurrencyControl.LockSet lockset = lockSetFactory.getLockSet(resourceName, true);
lockset.lock(org.omg.CosConcurrencyControl.lock_mode.from_int(selected_index));
}
catch (org.openorb.ccs.LockSetNotFound e) {}
addLock(resourceName, selected_index);
}
else
changeLock(resourceName, selected_index);
}
/**
* change the lock mode of the resource
* @param resourceName the resource to lock
* @param selected_index the new lock mode
*/
private void changeLock(String resourceName, int selected_index)
{
Integer previousLock = (Integer)(resourceLock.get(resourceName));
if (previousLock.intValue() != selected_index)
{
try
{
org.omg.CosConcurrencyControl.LockSet lockset = lockSetFactory.getLockSet(resourceName, true);
lockset.change_mode(lock_mode.from_int(previousLock.intValue()), lock_mode.from_int(selected_index));
removeLock(resourceName, previousLock.intValue());
addLock(resourceName, selected_index);
}
catch (org.omg.CosConcurrencyControl.LockNotHeld e)
{
System.out.println("lock not held");
return;
}
catch (org.openorb.ccs.LockSetNotFound e) { System.out.println("Lock set not found");}
}
}
/**
* unlock the resource for the selection mode
* @param resourceName the resource to unlock
* @param selected_index the selected lock mode
*/
private void unlock(String resourceName, int selected_index)
{
if (resourceName.equals(""))
return;
if ((resourceLock.containsKey(resourceName))
&& ((Integer)(resourceLock.get(resourceName))).intValue() == selected_index)
{
try
{
org.omg.CosConcurrencyControl.LockSet lockset = lockSetFactory.getLockSet(resourceName, true);
lockset.unlock(org.omg.CosConcurrencyControl.lock_mode.from_int(selected_index));
removeLock(resourceName, selected_index);
}
catch (org.omg.CosConcurrencyControl.LockNotHeld e) {System.out.println("lock not held"); return;}
catch (org.openorb.ccs.LockSetNotFound e) {}
}
}
/**
* try if it is possible locking the resource with the selection mode
* @param selected_index the selected lock mode
* @return true if you can lock the resource with this selection lock mode
*/
private boolean trylock(String resourceName, int selected_index)
{
try
{
org.omg.CosConcurrencyControl.LockSet lockset = lockSetFactory.getLockSet(resourceName, true);
return lockset.try_lock(org.omg.CosConcurrencyControl.lock_mode.from_int(selected_index));
}
catch (org.openorb.ccs.LockSetNotFound e) { System.out.println("LockSet Not Found"); System.exit(0); return false;}
}
/**
* update the lock list for internal use
* @param resourceName the resource that has been locked
* @param selected_index the lock mode of the resource
*/
private void addLock(String resourceName, int selected_index)
{
String value = resourceName + " " + modes[selected_index];
resourceLock.put(resourceName, new Integer(selected_index));
locks.addElement(value);
}
/**
* update the lock list (for internal use)
* @param resourceName the resource that has been unlocked
* @param selected_index, the previous lock mode of the resource
*/
private void removeLock(String resourceName, int selected_index)
{
String value = resourceName + " " + modes[selected_index];
if (locks.contains(value))
locks.removeElement(value);
resourceLock.remove(resourceName);
}
/**
* return whether the resource is locked
* @param resourceName the resource
* @param selected_index the lock mode
*/
private boolean alreadyLocked(String resourceName, int selected_index)
{
return locks.contains(resourceName + " " + modes[selected_index]);
}
static public void main(String args[])
{
junit.textui.TestRunner.run(new TestSuite(CCSTest.class));
}
}
|
|
From: Michael R. <mr...@us...> - 2002-01-10 23:06:48
|
Update of /cvsroot/openorb/ConcurrencyControlService/src/test/src/org/openorb/ccs/test In directory usw-pr-cvs1:/tmp/cvs-serv27066/src/test/src/org/openorb/ccs/test Removed Files: CCSTest.java Log Message: #501914: Removed the sub sir: src Fixed several problems with the bash scripts. --- CCSTest.java DELETED --- |
|
From: Michael R. <mr...@us...> - 2002-01-10 23:06:48
|
Update of /cvsroot/openorb/ConcurrencyControlService In directory usw-pr-cvs1:/tmp/cvs-serv27066 Modified Files: build.sh test.bat test.sh Log Message: #501914: Removed the sub sir: src Fixed several problems with the bash scripts. Index: build.sh =================================================================== RCS file: /cvsroot/openorb/ConcurrencyControlService/build.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- build.sh 2002/01/10 09:01:29 1.2 +++ build.sh 2002/01/10 23:06:42 1.3 @@ -1,34 +1,31 @@ -#!/bin/sh -# $Id$ - -# -# Set up the environment -# -if [ -z "$JAVA_HOME" ] ; then - JAVAC=`which java` - if [ -z "$JAVAC" ] ; then - echo "Cannot find JAVA. Please set your PATH." - exit 1 - fi - JAVA_BIN=`dirname $JAVAC` - JAVA_HOME=$JAVA_BIN/.. -fi - -JAVAC=$JAVA_HOME/bin/java - -# -# Concatenate all the libraries in the lib directory and append -# it to the classpath environment variable -# -CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH - -# Change the attributs for the antRun file - -chmod u+x lib/bin/antRun - -# -# Execute the build tool passing the build.xml file -# -$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml +#!/bin/sh +# $Id$ + +# +# Set up the environment +# +if [ -z "$JAVA_HOME" ] ; then + JAVAC=`which java` + if [ -z "$JAVAC" ] ; then + echo "Cannot find JAVA. Please set your PATH." + exit 1 + fi + JAVA_BIN=`dirname $JAVAC` + JAVA_HOME=$JAVA_BIN/.. +fi + +JAVAC=$JAVA_HOME/bin/java + +# +# Concatenate all the libraries in the lib directory and append +# it to the classpath environment variable +# +CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH + +# +# Execute the build tool passing the build.xml file +# +$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml + Index: test.bat =================================================================== RCS file: /cvsroot/openorb/ConcurrencyControlService/test.bat,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- test.bat 2002/01/09 12:24:21 1.1.1.1 +++ test.bat 2002/01/10 23:06:42 1.2 @@ -1,10 +1,11 @@ @echo off REM $Id$ set JAVA=%JAVA_HOME%\bin\java +set JAVA_FLAGS="-Dorg.omg.CORBA.ORBClass=org.openorb.CORBA.ORB -Dorg.omg.CORBA.ORBSingletonClass=org.openorb.CORBA.ORBSingleton" set cp=%CLASSPATH% for %%i in (lib\*.jar) do call cp.bat %%i for %%i in (dist\*.jar) do call cp.bat %%i set CP="%JAVA_HOME%\lib\tools.jar;%CP%;src\test\src" -%JAVA% -classpath %CP% org.openorb.ccs.test.CCSTestHarness -execute +%JAVA% %JAVA_FLAGS% -classpath %CP% org.openorb.ccs.test.CCSTestHarness -execute Index: test.sh =================================================================== RCS file: /cvsroot/openorb/ConcurrencyControlService/test.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- test.sh 2002/01/09 12:24:21 1.1.1.1 +++ test.sh 2002/01/10 23:06:42 1.2 @@ -1,32 +1,32 @@ -#!/bin/sh -# $Id$ - -# -# Set up the environment -# -if [ -z "$JAVA_HOME" ] ; then - JAVAC=`which java` - if [ -z "$JAVAC" ] ; then - echo "Cannot find JAVA. Please set your PATH." - exit 1 - fi - JAVA_BIN=`dirname $JAVAC` - JAVA_HOME=$JAVA_BIN/.. -fi - -JAVAC=$JAVA_HOME/bin/java - -# -# Concatenate all the libraries in the lib directory and append -# it to the classpath environment variable -# -CLASSPATH=`echo dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH -CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH - - -# -# Execute the build tool passing the build.xml file -# -echo $JAVAC -cp $CLASSPATH org.openorb.ccs.test.CCSTestHarness -execute -$JAVAC -cp $CLASSPATH org.openorb.ccs.test.CCSTestHarness -execute +#!/bin/sh +# $Id$ + +# +# Set up the environment +# +if [ -z "$JAVA_HOME" ] ; then + JAVAC=`which java` + if [ -z "$JAVAC" ] ; then + echo "Cannot find JAVA. Please set your PATH." + exit 1 + fi + JAVA_BIN=`dirname $JAVAC` + JAVA_HOME=$JAVA_BIN/.. +fi + +JAVAC=$JAVA_HOME/bin/java +JAVA_FLAGS="-Dorg.omg.CORBA.ORBClass=org.openorb.CORBA.ORB -Dorg.omg.CORBA.ORBSingletonClass=org.openorb.CORBA.ORBSingleton" + +# +# Concatenate all the libraries in the lib directory and append +# it to the classpath environment variable +# +CLASSPATH=`echo dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH +CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH + +# +# Execute the build tool passing the build.xml file +# +$JAVAC $JAVA_FLAGS -cp $CLASSPATH org.openorb.ccs.test.CCSTest -execute + |
|
From: Michael R. <mr...@us...> - 2002-01-10 23:06:48
|
Update of /cvsroot/openorb/ConcurrencyControlService/src
In directory usw-pr-cvs1:/tmp/cvs-serv27066/src
Modified Files:
build.xml
Log Message:
#501914: Removed the sub sir: src
Fixed several problems with the bash scripts.
Index: build.xml
===================================================================
RCS file: /cvsroot/openorb/ConcurrencyControlService/src/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- build.xml 2002/01/10 18:57:35 1.2
+++ build.xml 2002/01/10 23:06:42 1.3
@@ -173,7 +173,7 @@
<target name="test" >
<mkdir dir="${build}/test" />
- <javac srcdir="${test}/src"
+ <javac srcdir="${test}"
destdir="${build}/test"
classpath="${classpath}" debug="on" deprecation="${deprecation}"/>
<jar jarfile="${dist}/${ccs-tests-jar}"
@@ -376,4 +376,4 @@
</target>
-</project>
\ No newline at end of file
+</project>
|
|
From: Michael R. <mr...@us...> - 2002-01-10 22:57:26
|
Update of /cvsroot/openorb/ConcurrencyControlService/src/test/org/openorb/ccs/test In directory usw-pr-cvs1:/tmp/cvs-serv24922/org/openorb/ccs/test Log Message: Directory /cvsroot/openorb/ConcurrencyControlService/src/test/org/openorb/ccs/test added to the repository |
|
From: Michael R. <mr...@us...> - 2002-01-10 22:57:09
|
Update of /cvsroot/openorb/ConcurrencyControlService/src/test/org/openorb/ccs In directory usw-pr-cvs1:/tmp/cvs-serv24813/org/openorb/ccs Log Message: Directory /cvsroot/openorb/ConcurrencyControlService/src/test/org/openorb/ccs added to the repository |
|
From: Michael R. <mr...@us...> - 2002-01-10 22:56:59
|
Update of /cvsroot/openorb/ConcurrencyControlService/src/test/org/openorb In directory usw-pr-cvs1:/tmp/cvs-serv24727/org/openorb Log Message: Directory /cvsroot/openorb/ConcurrencyControlService/src/test/org/openorb added to the repository |
|
From: Michael R. <mr...@us...> - 2002-01-10 22:56:46
|
Update of /cvsroot/openorb/ConcurrencyControlService/src/test/org In directory usw-pr-cvs1:/tmp/cvs-serv24663/org Log Message: Directory /cvsroot/openorb/ConcurrencyControlService/src/test/org added to the repository |
|
From: Michael R. <mr...@us...> - 2002-01-10 22:54:25
|
Update of /cvsroot/openorb/EvaluatorUtility/src
In directory usw-pr-cvs1:/tmp/cvs-serv23589/src
Modified Files:
build.xml
Log Message:
Fixed Linux compile problems. Fixed the test/build.sh scripts.
Index: build.xml
===================================================================
RCS file: /cvsroot/openorb/EvaluatorUtility/src/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- build.xml 2002/01/10 20:43:37 1.4
+++ build.xml 2002/01/10 22:54:22 1.5
@@ -130,8 +130,8 @@
</target>
<target name="jar-all" depends="jar,test" >
- <delete file="${dist}/${evaluator-test-jar}" />
- <jar jarfile="${dist}/${evaluator-test-jar}"
+ <delete file="${dist}/${evaluator-tests-jar}" />
+ <jar jarfile="${dist}/${evaluator-tests-jar}"
basedir="${build}/test" />
</target>
@@ -188,8 +188,8 @@
tofile="${bin}/CHANGELOG" />
<copy file="${dist}/${evaluator-main-jar}"
tofile="${bin}/lib/${evaluator-main-jar}" />
- <copy file="${dist}/${evaluator-test-jar}"
- tofile="${bin}/lib/${evaluator-test-jar}" />
+ <copy file="${dist}/${evaluator-tests-jar}"
+ tofile="${bin}/lib/${evaluator-tests-jar}" />
<copy todir="${bin}/doc/javadoc">
<fileset dir="${dist}/javadoc" />
</copy>
@@ -224,4 +224,4 @@
<target name="all" depends="clean,jar-all, javadoc">
</target>
-</project>
\ No newline at end of file
+</project>
|
|
From: Michael R. <mr...@us...> - 2002-01-10 22:54:25
|
Update of /cvsroot/openorb/EvaluatorUtility In directory usw-pr-cvs1:/tmp/cvs-serv23589 Modified Files: build.sh test.bat test.sh Log Message: Fixed Linux compile problems. Fixed the test/build.sh scripts. Index: build.sh =================================================================== RCS file: /cvsroot/openorb/EvaluatorUtility/build.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- build.sh 2002/01/10 09:01:29 1.2 +++ build.sh 2002/01/10 22:54:22 1.3 @@ -1,30 +1,30 @@ -#!/bin/sh -# $Id$ - -# -# Set up the environment -# -if [ -z "$JAVA_HOME" ] ; then - JAVAC=`which java` - if [ -z "$JAVAC" ] ; then - echo "Cannot find JAVA. Please set your PATH." - exit 1 - fi - JAVA_BIN=`dirname $JAVAC` - JAVA_HOME=$JAVA_BIN/.. -fi - -JAVAC=$JAVA_HOME/bin/java - -# -# Concatenate all the libraries in the lib directory and append -# it to the classpath environment variable -# -CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH - -chmod u+x lib/bin/antRun -# -# Execute the build tool passing the build.xml file -# -$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml +#!/bin/sh +# $Id$ + +# +# Set up the environment +# +if [ -z "$JAVA_HOME" ] ; then + JAVAC=`which java` + if [ -z "$JAVAC" ] ; then + echo "Cannot find JAVA. Please set your PATH." + exit 1 + fi + JAVA_BIN=`dirname $JAVAC` + JAVA_HOME=$JAVA_BIN/.. +fi + +JAVAC=$JAVA_HOME/bin/java + +# +# Concatenate all the libraries in the lib directory and append +# it to the classpath environment variable +# +CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH + +# +# Execute the build tool passing the build.xml file +# +$JAVAC -cp $CLASSPATH -Dant.home=lib org.apache.tools.ant.Main "$@" -buildfile src/build.xml + Index: test.bat =================================================================== RCS file: /cvsroot/openorb/EvaluatorUtility/test.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- test.bat 2002/01/10 18:59:11 1.1 +++ test.bat 2002/01/10 22:54:22 1.2 @@ -1,10 +1,11 @@ @echo off REM $Id$ set JAVA=%JAVA_HOME%\bin\java +set JAVA_FLAGS="-Dorg.omg.CORBA.ORBClass=org.openorb.CORBA.ORB -Dorg.omg.CORBA.ORBSingletonClass=org.openorb.CORBA.ORBSingleton" set cp=%JAVA_HOME%\lib\tools.jar;%CLASSPATH% for %%i in (..\OpenORB\dist\*.jar) do call cp.bat %%i for %%i in (dist\*.jar) do call cp.bat %%i -%JAVA% -cp "%CP%" org.openorb.constraint.test.ConstraintEvaluatorTest -%JAVA% -cp "%CP%" org.openorb.constraint.test.DynamicValueTest +%JAVA% %JAVA_FLAGS% -cp "%CP%" org.openorb.constraint.test.ConstraintEvaluatorTest +%JAVA% %JAVA_FLAGS% -cp "%CP%" org.openorb.constraint.test.DynamicValueTest Index: test.sh =================================================================== RCS file: /cvsroot/openorb/EvaluatorUtility/test.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- test.sh 2002/01/10 18:59:11 1.1 +++ test.sh 2002/01/10 22:54:22 1.2 @@ -1,31 +1,33 @@ -#!/bin/sh -# $Id$ - -# -# Set up the environment -# -if [ -z "$JAVA_HOME" ] ; then - JAVAC=`which java` - if [ -z "$JAVAC" ] ; then - echo "Cannot find JAVA. Please set your PATH." - exit 1 - fi - JAVA_BIN=`dirname $JAVAC` - JAVA_HOME=$JAVA_BIN/.. -fi - -JAVAC=$JAVA_HOME/bin/java - -# -# Concatenate all the libraries in the lib directory and append -# it to the classpath environment variable -# -CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=`echo dist/*.jar | tr ' ' ':'`:$CLASSPATH -CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH - -# -# Execute the build tool passing the build.xml file -# -$JAVAC -cp $CLASSPATH org.openorb.constraint.test.ConstraintEvaluatorTest -$JAVAC -cp $CLASSPATH org.openorb.constraint.test.DynamicValueTest +#!/bin/sh +# $Id$ + +# +# Set up the environment +# +if [ -z "$JAVA_HOME" ] ; then + JAVAC=`which java` + if [ -z "$JAVAC" ] ; then + echo "Cannot find JAVA. Please set your PATH." + exit 1 + fi + JAVA_BIN=`dirname $JAVAC` + JAVA_HOME=$JAVA_BIN/.. +fi + +JAVAC=$JAVA_HOME/bin/java +JAVA_FLAGS="-Dorg.omg.CORBA.ORBClass=org.openorb.CORBA.ORB -Dorg.omg.CORBA.ORBSingletonClass=org.openorb.CORBA.ORBSingleton" + +# +# Concatenate all the libraries in the lib directory and append +# it to the classpath environment variable +# +CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH + +# +# Execute the build tool passing the build.xml file +# +$JAVAC $JAVA_FLAGS -cp $CLASSPATH org.openorb.constraint.test.ConstraintEvaluatorTest +$JAVAC $JAVA_FLAGS -cp $CLASSPATH org.openorb.constraint.test.DynamicValueTest + |
|
From: Michael R. <mr...@us...> - 2002-01-10 20:47:23
|
Update of /cvsroot/openorb/TradingService In directory usw-pr-cvs1:/tmp/cvs-serv12447/TradingService Modified Files: build.bat build.sh Log Message: When creating the tarballs the ManagementBoard plugins are built. The three packages INS, IR, Trading have plugins for the Board and and depend on the board plugin interfaces. Added the Board to the path. Index: build.bat =================================================================== RCS file: /cvsroot/openorb/TradingService/build.bat,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- build.bat 2002/01/10 09:01:30 1.2 +++ build.bat 2002/01/10 20:47:20 1.3 @@ -6,5 +6,6 @@ for %%i in (..\OpenORB\dist\*.jar) do call cp.bat %%i for %%i in (..\PersistentStateService\dist\*.jar) do call cp.bat %%i for %%i in (..\TransactionService\dist\*.jar) do call cp.bat %%i +for %%i in (..\ManagementBoard\dist\*.jar) do call cp.bat %%i %JAVA% -classpath "%CP%" -Dant.home=lib org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 -buildfile src/build.xml Index: build.sh =================================================================== RCS file: /cvsroot/openorb/TradingService/build.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- build.sh 2002/01/10 09:01:30 1.2 +++ build.sh 2002/01/10 20:47:20 1.3 @@ -24,6 +24,7 @@ CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH CLASSPATH=`echo ../TransactionService/dist/*.jar | tr ' ' ':'`:$CLASSPATH CLASSPATH=`echo ../PersistentStateService/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../ManagementBoard/dist/*.jar | tr ' ' ':'`:$CLASSPATH CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH # Change the attributs for the antRun file |
|
From: Michael R. <mr...@us...> - 2002-01-10 20:47:23
|
Update of /cvsroot/openorb/NamingService In directory usw-pr-cvs1:/tmp/cvs-serv12447/NamingService Modified Files: build.bat build.sh Log Message: When creating the tarballs the ManagementBoard plugins are built. The three packages INS, IR, Trading have plugins for the Board and and depend on the board plugin interfaces. Added the Board to the path. Index: build.bat =================================================================== RCS file: /cvsroot/openorb/NamingService/build.bat,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- build.bat 2002/01/09 12:26:06 1.1.1.1 +++ build.bat 2002/01/10 20:47:20 1.2 @@ -6,5 +6,6 @@ for %%i in (..\OpenORB\dist\*.jar) do call cp.bat %%i for %%i in (..\TransactionService\dist\*.jar) do call cp.bat %%i for %%i in (..\PersistentStateService\dist\*.jar) do call cp.bat %%i +for %%i in (..\ManagementBoard\dist\*.jar) do call cp.bat %%i %JAVA% -classpath "%CP%" -Dant.home=lib org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 -buildfile src/build.xml Index: build.sh =================================================================== RCS file: /cvsroot/openorb/NamingService/build.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- build.sh 2002/01/10 09:01:29 1.2 +++ build.sh 2002/01/10 20:47:20 1.3 @@ -24,6 +24,7 @@ CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH CLASSPATH=`echo ../TransactionService/dist/*.jar | tr ' ' ':'`:$CLASSPATH CLASSPATH=`echo ../PersistentStateService/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../ManagementBoard/dist/*.jar | tr ' ' ':'`:$CLASSPATH CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH # Change the attributs for the antRun file |
|
From: Michael R. <mr...@us...> - 2002-01-10 20:47:22
|
Update of /cvsroot/openorb/InterfaceRepository In directory usw-pr-cvs1:/tmp/cvs-serv12447/InterfaceRepository Modified Files: build.bat build.sh Log Message: When creating the tarballs the ManagementBoard plugins are built. The three packages INS, IR, Trading have plugins for the Board and and depend on the board plugin interfaces. Added the Board to the path. Index: build.bat =================================================================== RCS file: /cvsroot/openorb/InterfaceRepository/build.bat,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- build.bat 2002/01/09 10:52:40 1.1.1.1 +++ build.bat 2002/01/10 20:47:20 1.2 @@ -6,5 +6,6 @@ for %%i in (..\OpenORB\dist\*.jar) do call cp.bat %%i for %%i in (..\TransactionService\dist\*.jar) do call cp.bat %%i for %%i in (..\PersistentStateService\dist\*.jar) do call cp.bat %%i +for %%i in (..\ManagementBoard\dist\*.jar) do call cp.bat %%i %JAVA% -classpath "%CP%" -Dant.home=lib org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 -buildfile src/build.xml Index: build.sh =================================================================== RCS file: /cvsroot/openorb/InterfaceRepository/build.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- build.sh 2002/01/10 09:01:29 1.2 +++ build.sh 2002/01/10 20:47:20 1.3 @@ -24,6 +24,7 @@ CLASSPATH=`echo ../OpenORB/dist/*.jar | tr ' ' ':'`:$CLASSPATH CLASSPATH=`echo ../TransactionService/dist/*.jar | tr ' ' ':'`:$CLASSPATH CLASSPATH=`echo ../PersistentStateService/dist/*.jar | tr ' ' ':'`:$CLASSPATH +CLASSPATH=`echo ../ManagementBoard/dist/*.jar | tr ' ' ':'`:$CLASSPATH CLASSPATH=$JAVA_HOME/lib/tools.jar:$CLASSPATH # Change the attributs for the antRun file |
|
From: Michael R. <mr...@us...> - 2002-01-10 20:43:40
|
Update of /cvsroot/openorb/EvaluatorUtility/src
In directory usw-pr-cvs1:/tmp/cvs-serv11661
Modified Files:
build.xml
Log Message:
Fixed a problem with the test target, the classpath was missing.
Index: build.xml
===================================================================
RCS file: /cvsroot/openorb/EvaluatorUtility/src/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- build.xml 2002/01/10 20:32:34 1.3
+++ build.xml 2002/01/10 20:43:37 1.4
@@ -49,8 +49,8 @@
<property name="src" value="src/main"/>
<property name="build" value="build"/>
<property name="dist" value="dist" />
- <property name="test" value="src/main/org/openorb/constraint/test/" />
- <property name="idl" value="src/main/org/openorb/constraint/test/idl" />
+ <property name="test" value="src/test/org/openorb/constraint/test/" />
+ <property name="idl" value="src/test/org/openorb/constraint/test/idl" />
<property name="lib" value="lib" />
<property name="etc" value="src/etc" />
<property name="conf" value="src/config" />
@@ -65,6 +65,11 @@
<property name="classpath" value=""${java.class.path};${build}\main;${build}\test"" />
</target>
+ <path id="project.class.path">
+ <pathelement path="${java.class.path}" />
+ <pathelement path="${build}/main" />
+ </path>
+
<!-- =============================== -->
<!-- OpenORB EU compilation -->
<!-- =============================== -->
@@ -99,7 +104,8 @@
<java classname="org.openorb.compiler.IdlCompiler"
fork="yes">
- <arg line="-silence ${idl}/evaluator.idl -d ${build}/gensrc"/>
+ <arg line="-silence ${idl}/evaluator.idl -d ${build}/gensrc"/>
+ <classpath refid="project.class.path" />
</java>
<javac srcdir="${test};${build}/gensrc"
|
|
From: Michael R. <mr...@us...> - 2002-01-10 20:32:39
|
Update of /cvsroot/openorb/EvaluatorUtility/src/main/org/openorb/constraint/test In directory usw-pr-cvs1:/tmp/cvs-serv7859/main/org/openorb/constraint/test Removed Files: ConstraintEvaluatorTest.java DynamicValueTest.java Log Message: #501909: Moved the test case in the correct directory. --- ConstraintEvaluatorTest.java DELETED --- --- DynamicValueTest.java DELETED --- |
|
From: Michael R. <mr...@us...> - 2002-01-10 20:32:39
|
Update of /cvsroot/openorb/EvaluatorUtility/src/main/org/openorb/constraint/test/idl In directory usw-pr-cvs1:/tmp/cvs-serv7859/main/org/openorb/constraint/test/idl Removed Files: evaluator.idl Log Message: #501909: Moved the test case in the correct directory. --- evaluator.idl DELETED --- |
2 messages has been excluded from this view by a project administrator.
