idok-commit AT lists.psi.ch
Subject: Commit emails of the iDok project
List archive
[idok-commit] idok commit r183 - in branches/rest: . java/ch/idok/service/client/admin/corba java/ch/idok/service/client/cli/corba java/ch/idok/service/client/corba java/ch/idok/service/client/search/corba misc/eclipse python/generate_jnlp scripts/unix scripts/windows sites/psi/scripts/unix sites/psi/scripts/windows sites/psi/www
Chronological Thread
- From: "AFS account Roman Geus" <geus AT savannah.psi.ch>
- To: idok-commit AT lists.psi.ch
- Subject: [idok-commit] idok commit r183 - in branches/rest: . java/ch/idok/service/client/admin/corba java/ch/idok/service/client/cli/corba java/ch/idok/service/client/corba java/ch/idok/service/client/search/corba misc/eclipse python/generate_jnlp scripts/unix scripts/windows sites/psi/scripts/unix sites/psi/scripts/windows sites/psi/www
- Date: Tue, 26 Aug 2008 16:55:41 +0200
- List-archive: <https://lists.web.psi.ch/pipermail/idok-commit/>
- List-id: Commit emails of the iDok project <idok-commit.lists.psi.ch>
Author: geus
Date: Tue Aug 26 16:55:41 2008
New Revision: 183
Log:
Renamed class ClientProvider to class CorbaClientProvider
Added:
branches/rest/java/ch/idok/service/client/corba/CorbaClientProvider.java
- copied, changed from r166,
/branches/rest/java/ch/idok/service/client/corba/ClientProvider.java
Removed:
branches/rest/java/ch/idok/service/client/corba/ClientProvider.java
Modified:
branches/rest/java/ch/idok/service/client/admin/corba/CorbaAdminService.java
branches/rest/java/ch/idok/service/client/cli/corba/CorbaCLIFactoryService.java
branches/rest/java/ch/idok/service/client/search/corba/CorbaSearchService.java
branches/rest/local-server.xml
branches/rest/misc/eclipse/iDok_server.launch
branches/rest/python/generate_jnlp/generate_jnlp.py
branches/rest/scripts/unix/idok
branches/rest/scripts/unix/idok_admin
branches/rest/scripts/unix/idok_gui
branches/rest/scripts/unix/idok_thin
branches/rest/scripts/windows/idok.cmd
branches/rest/scripts/windows/idok_admin.cmd
branches/rest/scripts/windows/idok_gui.cmd
branches/rest/scripts/windows/idok_thin.cmd
branches/rest/sites/psi/scripts/unix/idok
branches/rest/sites/psi/scripts/unix/idok_admin
branches/rest/sites/psi/scripts/unix/idok_thin
branches/rest/sites/psi/scripts/windows/idok.cmd
branches/rest/sites/psi/scripts/windows/idok_admin.cmd
branches/rest/sites/psi/scripts/windows/idok_gui.cmd
branches/rest/sites/psi/scripts/windows/idok_thin.cmd
branches/rest/sites/psi/www/idok.jnlp
Modified:
branches/rest/java/ch/idok/service/client/admin/corba/CorbaAdminService.java
==============================================================================
---
branches/rest/java/ch/idok/service/client/admin/corba/CorbaAdminService.java
(original)
+++
branches/rest/java/ch/idok/service/client/admin/corba/CorbaAdminService.java
Tue Aug 26 16:55:41 2008
@@ -27,7 +27,7 @@
import ch.idok.common.errorhandling.DmsException;
import ch.idok.common.errorhandling.ErrorType;
import ch.idok.common.util.DmsCredentials;
-import ch.idok.service.client.corba.ClientProvider;
+import ch.idok.service.client.corba.CorbaClientProvider;
import ch.idok.service.common.admin.AdminService;
import ch.idok.service.common.admin.corba.obj.Admin;
import ch.idok.service.common.admin.corba.obj.AdminHelper;
@@ -53,7 +53,7 @@
* Provides client side DMS services through CORBA.
* @throws DmsException
*/
- public CorbaAdminService(ClientProvider provider) throws DmsException {
+ public CorbaAdminService(CorbaClientProvider provider) throws
DmsException {
try {
org.omg.CORBA.Object obj = provider.namingContext
.resolve_str("AdminService");
Modified:
branches/rest/java/ch/idok/service/client/cli/corba/CorbaCLIFactoryService.java
==============================================================================
---
branches/rest/java/ch/idok/service/client/cli/corba/CorbaCLIFactoryService.java
(original)
+++
branches/rest/java/ch/idok/service/client/cli/corba/CorbaCLIFactoryService.java
Tue Aug 26 16:55:41 2008
@@ -22,7 +22,7 @@
import ch.idok.common.errorhandling.DmsException;
import ch.idok.common.errorhandling.ErrorType;
import ch.idok.service.client.clienthandler.corba.ClientHandlerServiceImpl;
-import ch.idok.service.client.corba.ClientProvider;
+import ch.idok.service.client.corba.CorbaClientProvider;
import ch.idok.service.common.cli.CLIFactoryService;
import ch.idok.service.common.cli.CLIService;
import ch.idok.service.common.cli.corba.obj.CLIServiceFactory;
@@ -36,9 +36,9 @@
* @brief Implements the client side CLIFactory service through CORBA.
*/
public class CorbaCLIFactoryService implements CLIFactoryService {
- private ClientProvider provider_;
+ private CorbaClientProvider provider_;
- public CorbaCLIFactoryService(ClientProvider provider) {
+ public CorbaCLIFactoryService(CorbaClientProvider provider) {
provider_ = provider;
}
Copied:
branches/rest/java/ch/idok/service/client/corba/CorbaClientProvider.java
(from r166,
/branches/rest/java/ch/idok/service/client/corba/ClientProvider.java)
==============================================================================
--- /branches/rest/java/ch/idok/service/client/corba/ClientProvider.java
(original)
+++ branches/rest/java/ch/idok/service/client/corba/CorbaClientProvider.java
Tue Aug 26 16:55:41 2008
@@ -45,7 +45,7 @@
/**
* @brief Provides client side DMS services through CORBA.
*/
-public class ClientProvider implements Provider {
+public class CorbaClientProvider implements Provider {
/** @brief The client side ORB. */
public ORB orb = null;
Modified:
branches/rest/java/ch/idok/service/client/search/corba/CorbaSearchService.java
==============================================================================
---
branches/rest/java/ch/idok/service/client/search/corba/CorbaSearchService.java
(original)
+++
branches/rest/java/ch/idok/service/client/search/corba/CorbaSearchService.java
Tue Aug 26 16:55:41 2008
@@ -29,7 +29,7 @@
import ch.idok.common.errorhandling.DmsException;
import ch.idok.common.errorhandling.ErrorType;
import ch.idok.common.util.DmsCredentials;
-import ch.idok.service.client.corba.ClientProvider;
+import ch.idok.service.client.corba.CorbaClientProvider;
import ch.idok.service.common.Iterator;
import ch.idok.service.common.StandardIterator;
import ch.idok.service.common.common.corba.CredentialsConverter;
@@ -197,7 +197,7 @@
}
/** @brief Constructor. */
- public CorbaSearchService(ClientProvider provider) throws DmsException {
+ public CorbaSearchService(CorbaClientProvider provider) throws
DmsException {
logger =
Setup.getInstance().getLogger("service.client.search.corba");
try {
org.omg.CORBA.Object obj = provider.namingContext
Modified: branches/rest/local-server.xml
==============================================================================
--- branches/rest/local-server.xml (original)
+++ branches/rest/local-server.xml Tue Aug 26 16:55:41 2008
@@ -165,7 +165,7 @@
<sysproperty key="ORBInitRef.NameService"
value="corbaloc::${server.hostname}:1050/NameService" />
<sysproperty key="ch.idok.service.client.provider"
-
value="ch.idok.service.client.corba.ClientProvider" />
+
value="ch.idok.service.client.corba.CorbaClientProvider" />
<sysproperty key="ch.idok.service.common.keypass"
value="${keystore.passwd}" />
</java>
@@ -187,7 +187,7 @@
<sysproperty key="ORBInitRef.NameService"
value="corbaloc::${server.hostname}:1050/NameService" />
<sysproperty key="ch.idok.service.client.provider"
-
value="ch.idok.service.client.corba.ClientProvider" />
+
value="ch.idok.service.client.corba.CorbaClientProvider" />
<sysproperty key="ch.idok.service.common.keypass"
value="${keystore.passwd}" />
</java>
@@ -257,7 +257,7 @@
<sysproperty key="ch.idok.service.provider"
value="ch.idok.service.server.ServerProvider" />
<sysproperty key="ch.idok.service.client.provider"
-
value="ch.idok.service.client.corba.ClientProvider" />
+
value="ch.idok.service.client.corba.CorbaClientProvider" />
<sysproperty key="org.omg.CORBA.ORBInitialHost"
value="${server.hostname}" />
<sysproperty key="org.omg.CORBA.ORBInitialPort"
value="1050" />
@@ -315,7 +315,7 @@
<sysproperty key="ch.idok.service.provider"
value="ch.idok.service.server.ServerProvider" />
<sysproperty key="ch.idok.service.client.provider"
-
value="ch.idok.service.client.corba.ClientProvider" />
+
value="ch.idok.service.client.corba.CorbaClientProvider" />
<sysproperty key="org.omg.CORBA.ORBClass"
value="org.jacorb.orb.ORB" />
<sysproperty key="org.omg.CORBA.ORBSingletonClass"
Modified: branches/rest/misc/eclipse/iDok_server.launch
==============================================================================
--- branches/rest/misc/eclipse/iDok_server.launch (original)
+++ branches/rest/misc/eclipse/iDok_server.launch Tue Aug 26 16:55:41
2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/idok/java/ch/idok/service/server/Daemon.java"/>
@@ -8,10 +8,10 @@
</listAttribute>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables"
value="true"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="ch.idok.service.server.Daemon"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="idok"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-server
-Xbootclasspath/p:lib/jacorb.jar:lib/logkit.jar:lib/avalon-framework.jar
-Djava.util.logging.config.file=/tmp/idok_server/log/logging.conf
-Dch.idok.server.projectRoot=/tmp/idok_server/projects
-Dderby.system.home=/tmp/idok_server/derby
-Dch.idok.service.admin.backup.dir=/tmp/idok_server/derby_backup
-Dch.idok.server.httpdConfDir=/tmp/idok_server/httpd/conf.d
-Dch.idok.service.server.search.lucene.indexdir=lucene-index
-Dch.idok.service.server.search.lucene.repodir=/tmp/idok_server/indices
-DprivateKeyPassword=VgxfhGau7WL1T4qlD1NE
-Dch.idok.service.servers=ch.idok.service.server.rest.RestServer,ch.idok.service.server.corba.CorbaServer
-Dch.idok.service.provider=ch.idok.service.server.ServerProvider
-Dch.idok.service.client.provider=ch.idok.service.client.corba.ClientProvider
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-DORBInitRef.NameService=corbaloc::localhost:1050/NameService
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm
-Dch.idok.privateKeyPassword=90fd3498jw03riqdgs4f
-Dch.idok.service.server.admin.masterAdminName=idokadmin
-Dch.idok.service.server.login.config=DmsServerMpc1127
-Dch.idok.setupClass=ch.psi.idok.common.config.Setup"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-server
-Xbootclasspath/p:lib/jacorb.jar:lib/logkit.jar:lib/avalon-framework.jar
-Djava.util.logging.config.file=/tmp/idok_server/log/logging.conf
-Dch.idok.server.projectRoot=/tmp/idok_server/projects
-Dderby.system.home=/tmp/idok_server/derby
-Dch.idok.service.admin.backup.dir=/tmp/idok_server/derby_backup
-Dch.idok.server.httpdConfDir=/tmp/idok_server/httpd/conf.d
-Dch.idok.service.server.search.lucene.indexdir=lucene-index
-Dch.idok.service.server.search.lucene.repodir=/tmp/idok_server/indices
-DprivateKeyPassword=VgxfhGau7WL1T4qlD1NE
-Dch.idok.service.servers=ch.idok.service.server.rest.RestServer,ch.idok.service.server.corba.CorbaServer
-Dch.idok.service.provider=ch.idok.service.server.ServerProvider
-Dch.idok.service.client.provider=ch.idok.service.client.rest.RestClientProvider
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-DORBInitRef.NameService=corbaloc::localhost:1050/NameService
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm
-Dch.idok.privateKeyPassword=90fd3498jw03riqdgs4f
-Dch.idok.service.server.admin.masterAdminName=idokadmin
-Dch.idok.service.server.login.config=DmsServerMpc1127
-Dch.idok.setupClass=ch.psi.idok.common.config.Setup"/>
</launchConfiguration>
Modified: branches/rest/python/generate_jnlp/generate_jnlp.py
==============================================================================
--- branches/rest/python/generate_jnlp/generate_jnlp.py (original)
+++ branches/rest/python/generate_jnlp/generate_jnlp.py Tue Aug 26 16:55:41
2008
@@ -81,7 +81,7 @@
<property name="org.omg.CORBA.ORBSingletonClass"
value="org.jacorb.orb.ORBSingleton"/>
<property
name="org.omg.PortableInterceptor.ORBInitializerClass.bidir_init"
value="org.jacorb.orb.giop.BiDirConnectionInitializer"/>
<property name="ORBInitRef.NameService"
value="corbaloc::%(host)s:1050/NameService"/>
- <property name="ch.idok.service.client.provider"
value="ch.idok.service.client.corba.ClientProvider"/>
+ <property name="ch.idok.service.client.provider"
value="ch.idok.service.client.corba.CorbaClientProvider"/>
<property name="ch.idok.service.common.keypass"
value="P7GXtm6rPr5pT988N4Gm" />
<property name="com.trolltech.launcher.webstart" value="true"/>
<property name="com.trolltech.qt.internal.jambipath" value=""/>
@@ -146,7 +146,7 @@
<property name="org.omg.CORBA.ORBSingletonClass"
value="org.jacorb.orb.ORBSingleton"/>
<property
name="org.omg.PortableInterceptor.ORBInitializerClass.bidir_init"
value="org.jacorb.orb.giop.BiDirConnectionInitializer"/>
<property name="ORBInitRef.NameService"
value="corbaloc::%(host)s:1050/NameService"/>
- <property name="ch.idok.service.client.provider"
value="ch.idok.service.client.corba.ClientProvider"/>
+ <property name="ch.idok.service.client.provider"
value="ch.idok.service.client.corba.CorbaClientProvider"/>
<property name="ch.idok.service.common.keypass"
value="P7GXtm6rPr5pT988N4Gm" />
</resources>
@@ -186,7 +186,7 @@
<property name="org.omg.CORBA.ORBSingletonClass"
value="org.jacorb.orb.ORBSingleton"/>
<property
name="org.omg.PortableInterceptor.ORBInitializerClass.bidir_init"
value="org.jacorb.orb.giop.BiDirConnectionInitializer"/>
<property name="ORBInitRef.NameService"
value="corbaloc::%(host)s:1050/NameService"/>
- <property name="ch.idok.service.client.provider"
value="ch.idok.service.client.corba.ClientProvider"/>
+ <property name="ch.idok.service.client.provider"
value="ch.idok.service.client.corba.CorbaClientProvider"/>
<property name="ch.idok.service.common.keypass"
value="P7GXtm6rPr5pT988N4Gm" />
</resources>
Modified: branches/rest/scripts/unix/idok
==============================================================================
--- branches/rest/scripts/unix/idok (original)
+++ branches/rest/scripts/unix/idok Tue Aug 26 16:55:41 2008
@@ -20,6 +20,6 @@
-DORBInitRef.NameService=corbaloc::$IDOKSERVER:1050/NameService \
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
\
-cp $DISTDIR/idok.jar:$LIBDIR/svnkit.jar:$LIBDIR/commons-cli.jar \
-
-Dch.idok.service.client.provider=ch.idok.service.client.corba.ClientProvider
\
+
-Dch.idok.service.client.provider=ch.idok.service.client.corba.CorbaClientProvider
\
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm \
ch.idok.cli.DMS "$@"
Modified: branches/rest/scripts/unix/idok_admin
==============================================================================
--- branches/rest/scripts/unix/idok_admin (original)
+++ branches/rest/scripts/unix/idok_admin Tue Aug 26 16:55:41 2008
@@ -20,6 +20,6 @@
-DORBInitRef.NameService=corbaloc::$IDOKSERVER:1050/NameService \
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
\
-cp $DISTDIR/idok.jar:$LIBDIR/svnkit.jar:$LIBDIR/commons-cli.jar \
-
-Dch.idok.service.client.provider=ch.idok.service.client.corba.ClientProvider
\
+
-Dch.idok.service.client.provider=ch.idok.service.client.corba.CorbaClientProvider
\
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm \
ch.idok.cli.DMSAdmin "$@"
Modified: branches/rest/scripts/unix/idok_gui
==============================================================================
--- branches/rest/scripts/unix/idok_gui (original)
+++ branches/rest/scripts/unix/idok_gui Tue Aug 26 16:55:41 2008
@@ -25,6 +25,6 @@
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton \
-DORBInitRef.NameService=corbaloc::$IDOKSERVER:1050/NameService \
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
\
-
-Dch.idok.service.client.provider=ch.idok.service.client.corba.ClientProvider
\
+
-Dch.idok.service.client.provider=ch.idok.service.client.corba.CorbaClientProvider
\
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm \
ch.idok.qtgui.DmsGui
Modified: branches/rest/scripts/unix/idok_thin
==============================================================================
--- branches/rest/scripts/unix/idok_thin (original)
+++ branches/rest/scripts/unix/idok_thin Tue Aug 26 16:55:41 2008
@@ -19,7 +19,7 @@
-DORBInitRef.NameService=corbaloc::$IDOKSERVER:1050/NameService \
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
\
-cp $DISTDIR/idok_thin.jar \
-
-Dch.idok.service.client.provider=ch.idok.service.client.corba.ClientProvider
\
+
-Dch.idok.service.client.provider=ch.idok.service.client.corba.CorbaClientProvider
\
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm \
ch.idok.service.client.DMSthin "$@"
\ No newline at end of file
Modified: branches/rest/scripts/windows/idok.cmd
==============================================================================
--- branches/rest/scripts/windows/idok.cmd (original)
+++ branches/rest/scripts/windows/idok.cmd Tue Aug 26 16:55:41 2008
@@ -2,4 +2,4 @@
set LIBDIR=lib
set DISTDIR=antdist
set IDOKSERVER=localhost
-java
-Xbootclasspath/p:%LIBDIR%\jacorb.jar;%LIBDIR%\logkit.jar;%LIBDIR%\avalon-framework.jar
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-DORBInitRef.NameService=corbaloc::%IDOKSERVER%:1050/NameService
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-cp %DISTDIR%/idok.jar;%LIBDIR%/svnkit.jar;%LIBDIR%/commons-cli.jar
-Dch.idok.service.client.provider=ch.idok.service.client.corba.ClientProvider
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm ch.idok.cli.DMS %1 %2
%3 %4 %5 %6 %7 %8 %9
+java
-Xbootclasspath/p:%LIBDIR%\jacorb.jar;%LIBDIR%\logkit.jar;%LIBDIR%\avalon-framework.jar
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-DORBInitRef.NameService=corbaloc::%IDOKSERVER%:1050/NameService
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-cp %DISTDIR%/idok.jar;%LIBDIR%/svnkit.jar;%LIBDIR%/commons-cli.jar
-Dch.idok.service.client.provider=ch.idok.service.client.corba.CorbaClientProvider
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm ch.idok.cli.DMS %1 %2
%3 %4 %5 %6 %7 %8 %9
Modified: branches/rest/scripts/windows/idok_admin.cmd
==============================================================================
--- branches/rest/scripts/windows/idok_admin.cmd (original)
+++ branches/rest/scripts/windows/idok_admin.cmd Tue Aug 26 16:55:41
2008
@@ -2,5 +2,5 @@
set LIBDIR=lib
set DISTDIR=antdist
set IDOKSERVER=localhost
-java
-Xbootclasspath/p:%LIBDIR%\jacorb.jar;%LIBDIR%\logkit.jar;%LIBDIR%\avalon-framework.jar
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-DORBInitRef.NameService=corbaloc::%IDOKSERVER%:1050/NameService
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-cp %LIBDIR%\svnkit.jar;%DISTDIR%\idok.jar;%LIBDIR%\commons-cli.jar
-Dch.idok.service.client.provider=ch.idok.service.client.corba.ClientProvider
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm ch.idok.cli.DMSAdmin %1
%2 %3 %4 %5 %6 %7 %8 %9
+java
-Xbootclasspath/p:%LIBDIR%\jacorb.jar;%LIBDIR%\logkit.jar;%LIBDIR%\avalon-framework.jar
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-DORBInitRef.NameService=corbaloc::%IDOKSERVER%:1050/NameService
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-cp %LIBDIR%\svnkit.jar;%DISTDIR%\idok.jar;%LIBDIR%\commons-cli.jar
-Dch.idok.service.client.provider=ch.idok.service.client.corba.CorbaClientProvider
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm ch.idok.cli.DMSAdmin
%1 %2 %3 %4 %5 %6 %7 %8 %9
Modified: branches/rest/scripts/windows/idok_gui.cmd
==============================================================================
--- branches/rest/scripts/windows/idok_gui.cmd (original)
+++ branches/rest/scripts/windows/idok_gui.cmd Tue Aug 26 16:55:41 2008
@@ -2,4 +2,4 @@
set LIBDIR=lib
set DISTDIR=antdist
set IDOKSERVER=localhost
-java
-Xbootclasspath/p:%LIBDIR%\jacorb.jar;%LIBDIR%\logkit.jar;%LIBDIR%\avalon-framework.jar
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-DORBInitRef.NameService=corbaloc::%IDOKSERVER%:1050/NameService
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-cp
%LIBDIR%\svnkit.jar;%DISTDIR%\idok.jar;%LIBDIR%\commons-cli.jar;%DISTDIR%\qtgui.jar;%LIBDIR%\qtjambi.jar;%LIBDIR%\qtjambi-win32.jar
-Dch.idok.service.client.provider=ch.idok.service.client.corba.ClientProvider
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm ch.idok.qtgui.DmsGui
+java
-Xbootclasspath/p:%LIBDIR%\jacorb.jar;%LIBDIR%\logkit.jar;%LIBDIR%\avalon-framework.jar
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-DORBInitRef.NameService=corbaloc::%IDOKSERVER%:1050/NameService
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-cp
%LIBDIR%\svnkit.jar;%DISTDIR%\idok.jar;%LIBDIR%\commons-cli.jar;%DISTDIR%\qtgui.jar;%LIBDIR%\qtjambi.jar;%LIBDIR%\qtjambi-win32.jar
-Dch.idok.service.client.provider=ch.idok.service.client.corba.CorbaClientProvider
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm ch.idok.qtgui.DmsGui
Modified: branches/rest/scripts/windows/idok_thin.cmd
==============================================================================
--- branches/rest/scripts/windows/idok_thin.cmd (original)
+++ branches/rest/scripts/windows/idok_thin.cmd Tue Aug 26 16:55:41 2008
@@ -2,4 +2,4 @@
set LIBDIR=lib
set DISTDIR=antdist
set IDOKSERVER=localhost
-java
-Xbootclasspath/p:%LIBDIR%\jacorb.jar;%LIBDIR%\logkit.jar;%LIBDIR%\avalon-framework.jar
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-DORBInitRef.NameService=corbaloc::%IDOKSERVER%:1050/NameService
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-cp %DISTDIR%\idok_thin.jar
-Dch.idok.service.client.provider=ch.idok.service.client.corba.ClientProvider
-Dch.idok.setupClass=ch.idok.common.config.Setup
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm
ch.idok.service.client.DMSthin %1 %2 %3 %4 %5 %6 %7 %8 %9
+java
-Xbootclasspath/p:%LIBDIR%\jacorb.jar;%LIBDIR%\logkit.jar;%LIBDIR%\avalon-framework.jar
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-DORBInitRef.NameService=corbaloc::%IDOKSERVER%:1050/NameService
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-cp %DISTDIR%\idok_thin.jar
-Dch.idok.service.client.provider=ch.idok.service.client.corba.CorbaClientProvider
-Dch.idok.setupClass=ch.idok.common.config.Setup
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm
ch.idok.service.client.DMSthin %1 %2 %3 %4 %5 %6 %7 %8 %9
Modified: branches/rest/sites/psi/scripts/unix/idok
==============================================================================
--- branches/rest/sites/psi/scripts/unix/idok (original)
+++ branches/rest/sites/psi/scripts/unix/idok Tue Aug 26 16:55:41 2008
@@ -11,7 +11,7 @@
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
\
-cp $ROOT/svnkit.jar:$ROOT/idok.jar:$ROOT/commons-cli.jar \
-Dch.idok.service.server.principal=HTTP/dms02.psi.ch AT D.PSI.CH \
-
-Dch.idok.service.client.provider=ch.idok.service.client.corba.ClientProvider
\
+
-Dch.idok.service.client.provider=ch.idok.service.client.corba.CorbaClientProvider
\
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm \
-Dch.idok.setupClass=ch.psi.idok.common.config.Setup \
ch.idok.cli.DMS "$@"
Modified: branches/rest/sites/psi/scripts/unix/idok_admin
==============================================================================
--- branches/rest/sites/psi/scripts/unix/idok_admin (original)
+++ branches/rest/sites/psi/scripts/unix/idok_admin Tue Aug 26 16:55:41
2008
@@ -11,7 +11,7 @@
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
\
-cp $ROOT/svnkit.jar:$ROOT/idok.jar:$ROOT/commons-cli.jar \
-Dch.idok.service.server.principal=HTTP/dms02.psi.ch AT D.PSI.CH \
-
-Dch.idok.service.client.provider=ch.idok.service.client.corba.ClientProvider
\
+
-Dch.idok.service.client.provider=ch.idok.service.client.corba.CorbaClientProvider
\
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm \
-Dch.idok.setupClass=ch.psi.idok.common.config.Setup \
ch.idok.cli.DMSAdmin "$@"
Modified: branches/rest/sites/psi/scripts/unix/idok_thin
==============================================================================
--- branches/rest/sites/psi/scripts/unix/idok_thin (original)
+++ branches/rest/sites/psi/scripts/unix/idok_thin Tue Aug 26 16:55:41
2008
@@ -11,7 +11,7 @@
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
\
-cp $ROOT/idok_thin.jar \
-Dch.idok.service.server.principal=HTTP/dms02.psi.ch AT D.PSI.CH \
-
-Dch.idok.service.client.provider=ch.idok.service.client.corba.ClientProvider
\
+
-Dch.idok.service.client.provider=ch.idok.service.client.corba.CorbaClientProvider
\
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm \
-Dch.idok.setupClass=ch.psi.idok.common.config.Setup \
ch.idok.service.client.DMSthin "$@"
Modified: branches/rest/sites/psi/scripts/windows/idok.cmd
==============================================================================
--- branches/rest/sites/psi/scripts/windows/idok.cmd (original)
+++ branches/rest/sites/psi/scripts/windows/idok.cmd Tue Aug 26 16:55:41
2008
@@ -1,4 +1,4 @@
@echo off
set JAVA_HOME=\\softlib00\dms\jre1.6.0
set DMS_ROOT=S:\geus\dms
-%JAVA_HOME%\bin\java
-Xbootclasspath/p:%DMS_ROOT%\jacorb.jar;%DMS_ROOT%\logkit.jar;%DMS_ROOT%\avalon-framework.jar
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-DORBInitRef.NameService=corbaloc::dms02.psi.ch:1050/NameService
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-cp %DMS_ROOT%\svnkit.jar;%DMS_ROOT%\idok.jar;%DMS_ROOT%\commons-cli.jar
-Dch.idok.service.server.principal=HTTP/dms02.psi.ch AT D.PSI.CH
-Dch.idok.setupClass=ch.psi.idok.common.config.Setup
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm
-Dch.idok.service.client.provider=ch.idok.service.client.corba.ClientProvider
ch.idok.cli.DMS %1 %2 %3 %4 %5 %6 %7 %8 %9
+%JAVA_HOME%\bin\java
-Xbootclasspath/p:%DMS_ROOT%\jacorb.jar;%DMS_ROOT%\logkit.jar;%DMS_ROOT%\avalon-framework.jar
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-DORBInitRef.NameService=corbaloc::dms02.psi.ch:1050/NameService
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-cp %DMS_ROOT%\svnkit.jar;%DMS_ROOT%\idok.jar;%DMS_ROOT%\commons-cli.jar
-Dch.idok.service.server.principal=HTTP/dms02.psi.ch AT D.PSI.CH
-Dch.idok.setupClass=ch.psi.idok.common.config.Setup
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm
-Dch.idok.service.client.provider=ch.idok.service.client.corba.CorbaClientProvider
ch.idok.cli.DMS %1 %2 %3 %4 %5 %6 %7 %8 %9
Modified: branches/rest/sites/psi/scripts/windows/idok_admin.cmd
==============================================================================
--- branches/rest/sites/psi/scripts/windows/idok_admin.cmd (original)
+++ branches/rest/sites/psi/scripts/windows/idok_admin.cmd Tue Aug 26
16:55:41 2008
@@ -1,5 +1,5 @@
@echo off
set JAVA_HOME=\\softlib00\dms\jre1.6.0
set DMS_ROOT=S:\geus\dms
-%JAVA_HOME%\bin\java
-Xbootclasspath/p:%DMS_ROOT%\jacorb.jar;%DMS_ROOT%\logkit.jar;%DMS_ROOT%\avalon-framework.jar
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-DORBInitRef.NameService=corbaloc::dms02.psi.ch:1050/NameService
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-cp %DMS_ROOT%\svnkit.jar;%DMS_ROOT%\idok.jar;%DMS_ROOT%\commons-cli.jar
-Dch.idok.service.server.principal=HTTP/dms02.psi.ch AT D.PSI.CH
-Dch.idok.setupClass=ch.psi.idok.common.config.Setup
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm
-Dch.idok.service.client.provider=ch.idok.service.client.corba.ClientProvider
ch.idok.cli.DMSAdmin %1 %2 %3 %4 %5 %6 %7 %8 %9
+%JAVA_HOME%\bin\java
-Xbootclasspath/p:%DMS_ROOT%\jacorb.jar;%DMS_ROOT%\logkit.jar;%DMS_ROOT%\avalon-framework.jar
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-DORBInitRef.NameService=corbaloc::dms02.psi.ch:1050/NameService
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-cp %DMS_ROOT%\svnkit.jar;%DMS_ROOT%\idok.jar;%DMS_ROOT%\commons-cli.jar
-Dch.idok.service.server.principal=HTTP/dms02.psi.ch AT D.PSI.CH
-Dch.idok.setupClass=ch.psi.idok.common.config.Setup
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm
-Dch.idok.service.client.provider=ch.idok.service.client.corba.CorbaClientProvider
ch.idok.cli.DMSAdmin %1 %2 %3 %4 %5 %6 %7 %8 %9
Modified: branches/rest/sites/psi/scripts/windows/idok_gui.cmd
==============================================================================
--- branches/rest/sites/psi/scripts/windows/idok_gui.cmd (original)
+++ branches/rest/sites/psi/scripts/windows/idok_gui.cmd Tue Aug 26
16:55:41 2008
@@ -1,4 +1,4 @@
@echo off
set JAVA_HOME=\\softlib00\dms\jre1.6.0
set DMS_ROOT=S:\geus\dms
-%JAVA_HOME%\bin\java
-Xbootclasspath/p:%DMS_ROOT%\jacorb.jar;%DMS_ROOT%\logkit.jar;%DMS_ROOT%\avalon-framework.jar
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-DORBInitRef.NameService=corbaloc::dms02.psi.ch:1050/NameService
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-cp
%DMS_ROOT%\svnkit.jar;%DMS_ROOT%\idok.jar;%DMS_ROOT%\commons-cli.jar;%DMS_ROOT%\qtgui.jar;%DMS_ROOT%\qtjambi.jar;%DMS_ROOT%\qtjambi-win32.jar
-Dch.idok.service.server.principal=HTTP/dms02.psi.ch AT D.PSI.CH
-Dch.idok.setupClass=ch.psi.idok.common.config.Setup
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm
-Dch.idok.service.client.provider=ch.idok.service.client.corba.ClientProvider
ch.idok.qtgui.DmsGui
+%JAVA_HOME%\bin\java
-Xbootclasspath/p:%DMS_ROOT%\jacorb.jar;%DMS_ROOT%\logkit.jar;%DMS_ROOT%\avalon-framework.jar
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-DORBInitRef.NameService=corbaloc::dms02.psi.ch:1050/NameService
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-cp
%DMS_ROOT%\svnkit.jar;%DMS_ROOT%\idok.jar;%DMS_ROOT%\commons-cli.jar;%DMS_ROOT%\qtgui.jar;%DMS_ROOT%\qtjambi.jar;%DMS_ROOT%\qtjambi-win32.jar
-Dch.idok.service.server.principal=HTTP/dms02.psi.ch AT D.PSI.CH
-Dch.idok.setupClass=ch.psi.idok.common.config.Setup
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm
-Dch.idok.service.client.provider=ch.idok.service.client.corba.CorbaClientProvider
ch.idok.qtgui.DmsGui
Modified: branches/rest/sites/psi/scripts/windows/idok_thin.cmd
==============================================================================
--- branches/rest/sites/psi/scripts/windows/idok_thin.cmd (original)
+++ branches/rest/sites/psi/scripts/windows/idok_thin.cmd Tue Aug 26
16:55:41 2008
@@ -1,4 +1,4 @@
@echo off
set JAVA_HOME=\\softlib00\dms\jre1.6.0
set DMS_ROOT=S:\geus\dms
-%JAVA_HOME%\bin\java
-Xbootclasspath/p:%DMS_ROOT%\jacorb.jar;%DMS_ROOT%\logkit.jar;%DMS_ROOT%\avalon-framework.jar
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-DORBInitRef.NameService=corbaloc::dms02.psi.ch:1050/NameService
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-cp %DMS_ROOT%\idok_thin.jar
-Dch.idok.service.server.principal=HTTP/dms02.psi.ch AT D.PSI.CH
-Dch.idok.setupClass=ch.psi.idok.common.config.Setup
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm
-Dch.idok.service.client.provider=ch.idok.service.client.corba.ClientProvider
ch.idok.service.client.DMSthin %1 %2 %3 %4 %5 %6 %7 %8 %9
+%JAVA_HOME%\bin\java
-Xbootclasspath/p:%DMS_ROOT%\jacorb.jar;%DMS_ROOT%\logkit.jar;%DMS_ROOT%\avalon-framework.jar
-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-DORBInitRef.NameService=corbaloc::dms02.psi.ch:1050/NameService
-Dorg.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
-cp %DMS_ROOT%\idok_thin.jar
-Dch.idok.service.server.principal=HTTP/dms02.psi.ch AT D.PSI.CH
-Dch.idok.setupClass=ch.psi.idok.common.config.Setup
-Dch.idok.service.common.keypass=P7GXtm6rPr5pT988N4Gm
-Dch.idok.service.client.provider=ch.idok.service.client.corba.CorbaClientProvider
ch.idok.service.client.DMSthin %1 %2 %3 %4 %5 %6 %7 %8 %9
Modified: branches/rest/sites/psi/www/idok.jnlp
==============================================================================
--- branches/rest/sites/psi/www/idok.jnlp (original)
+++ branches/rest/sites/psi/www/idok.jnlp Tue Aug 26 16:55:41 2008
@@ -26,7 +26,7 @@
<property name="ORBInitRef.NameService"
value="corbaloc::dms02.psi.ch:1050/NameService"/>
<property
name="org.omg.PortableInterceptor.ORBInitializerClass.bidir_init"
value="org.jacorb.orb.giop.BiDirConnectionInitializer"/>
<property name="ch.idok.service.server.principal"
value="HTTP/dms02.psi.ch AT D.PSI.CH"/>
- <property name="ch.idok.service.client.provider"
value="ch.idok.service.client.corba.ClientProvider"/>
+ <property name="ch.idok.service.client.provider"
value="ch.idok.service.client.corba.CorbaClientProvider"/>
<property name="com.trolltech.launcher.webstart" value="true"/>
<property name="com.trolltech.qt.internal.jambipath" value=""/>
<property name="com.trolltech.qt.implicit-loading" value="false"/>
- [idok-commit] idok commit r183 - in branches/rest: . java/ch/idok/service/client/admin/corba java/ch/idok/service/client/cli/corba java/ch/idok/service/client/corba java/ch/idok/service/client/search/corba misc/eclipse python/generate_jnlp scripts/unix scripts/windows sites/psi/scripts/unix sites/psi/scripts/windows sites/psi/www, AFS account Roman Geus, 08/26/2008
Archive powered by MHonArc 2.6.19.