You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2010/07/12 19:47:26 UTC
svn commit: r963399 - in /incubator/oodt/trunk/catalog/src/main:
assembly/assembly.xml bin/catserv-client bin/catserv-server
Author: mattmann
Date: Mon Jul 12 17:47:26 2010
New Revision: 963399
URL: http://svn.apache.org/viewvc?rev=963399&view=rev
Log:
- progress towards OODT-15 One trunk for all OODT components with top level build
Modified:
incubator/oodt/trunk/catalog/src/main/assembly/assembly.xml
incubator/oodt/trunk/catalog/src/main/bin/catserv-client
incubator/oodt/trunk/catalog/src/main/bin/catserv-server
Modified: incubator/oodt/trunk/catalog/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/assembly/assembly.xml?rev=963399&r1=963398&r2=963399&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/assembly/assembly.xml (original)
+++ incubator/oodt/trunk/catalog/src/main/assembly/assembly.xml Mon Jul 12 17:47:26 2010
@@ -1,8 +1,18 @@
<!--
-Copyright 2008 California Institute of Technology. ALL RIGHTS
-RESERVED. U.S. Government Sponsorship acknowledged.
-
-$Id$
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<assembly>
<id>dist</id>
Modified: incubator/oodt/trunk/catalog/src/main/bin/catserv-client
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/bin/catserv-client?rev=963399&r1=963398&r2=963399&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/bin/catserv-client (original)
+++ incubator/oodt/trunk/catalog/src/main/bin/catserv-client Mon Jul 12 17:47:26 2010
@@ -1,4 +1,19 @@
#!/bin/csh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
set args
@@ -9,6 +24,6 @@ endif
${JAVA_HOME}/bin/java \
-Djava.ext.dirs=../lib \
-Djava.util.logging.config.file=../etc/logging.properties \
- -Dgov.nasa.jpl.oodt.cas.catalog.properties.file=../etc/catalog-service.properties \
- gov.nasa.jpl.oodt.cas.catalog.server.CatalogServiceCommandLineClient ${args}
+ -Dorg.apache.oodt.cas.catalog.properties.file=../etc/catalog-service.properties \
+ org.apache.oodt.cas.catalog.server.CatalogServiceCommandLineClient ${args}
Modified: incubator/oodt/trunk/catalog/src/main/bin/catserv-server
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/bin/catserv-server?rev=963399&r1=963398&r2=963399&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/bin/catserv-server (original)
+++ incubator/oodt/trunk/catalog/src/main/bin/catserv-server Mon Jul 12 17:47:26 2010
@@ -1,4 +1,20 @@
#!/bin/csh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
set args
@@ -9,6 +25,6 @@ endif
${JAVA_HOME}/bin/java \
-Djava.ext.dirs=../lib \
-Djava.util.logging.config.file=../etc/logging.properties \
- -Dgov.nasa.jpl.oodt.cas.catalog.properties.file=../etc/catalog-service.properties \
- gov.nasa.jpl.oodt.cas.catalog.server.CatalogServiceServerLauncher ${args}
+ -Dorg.apache.oodt.cas.catalog.properties.file=../etc/catalog-service.properties \
+ org.apache.oodt.cas.catalog.server.CatalogServiceServerLauncher ${args}
\ No newline at end of file