Merge "add catalog service start and stop scripts"

7 files changed, 288 insertions, 2 deletions

diff --git a/catalog-core/distribution/catalog-all/pom.xml b/catalog-core/distribution/catalog-all/pom.xml
index 37623729..88c45c4b 100644
--- a/catalog-core/distribution/catalog-all/pom.xml
+++ b/catalog-core/distribution/catalog-all/pom.xml
@@ -33,6 +33,32 @@
     <build>
         <plugins>
             <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/assembly/</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/assembly/</directory>
+                                    <filtering>false</filtering>
+                                    <includes>
+                                        <include>**/*</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                            <overwrite>true</overwrite>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
diff --git a/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.bat b/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.bat
new file mode 100644
index 00000000..9697dbab
--- /dev/null
+++ b/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.bat
@@ -0,0 +1,27 @@
+@REM

+@REM Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)

+@REM

+@REM Licensed under the Apache License, Version 2.0 (the "License");

+@REM you may not use this file except in compliance with the License.

+@REM You may obtain a copy of the License at

+@REM

+@REM         http://www.apache.org/licenses/LICENSE-2.0

+@REM

+@REM Unless required by applicable law or agreed to in writing, software

+@REM distributed under the License is distributed on an "AS IS" BASIS,

+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+@REM See the License for the specific language governing permissions and

+@REM limitations under the License.

+@REM

+@echo off

+title catalog

+

+set RUNHOME=%~dp0

+echo ##RUNHOME %RUNHOME%

+

+

+echo ### Starting catalog

+start /D %RUNHOME%catalog stop.bat

+

+echo ### Starting tomcat

+start /D %RUNHOME%tomcat bin\shutdown.bat 

diff --git a/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.sh b/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.sh
new file mode 100644
index 00000000..ae1999ab
--- /dev/null
+++ b/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+#
+# Licensed 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.
+#
+DIRNAME=`dirname $0`
+RUNHOME=`cd $DIRNAME/; pwd`
+echo @RUNHOME@ $RUNHOME
+
+echo "### Starting catalog";
+cd catalog
+./stop.sh &
+cd $RUNHOME
+
+
+echo "\n\n### Starting catalog-http server"
+cd ./tomcat
+./bin/shutdown.sh &
+echo "### Starting catalog end...";
diff --git a/catalog-core/distribution/catalog-all/src/main/assembly/startup.bat b/catalog-core/distribution/catalog-all/src/main/assembly/startup.bat
new file mode 100644
index 00000000..6dd72c8e
--- /dev/null
+++ b/catalog-core/distribution/catalog-all/src/main/assembly/startup.bat
@@ -0,0 +1,28 @@
+@REM

+@REM Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)

+@REM

+@REM Licensed under the Apache License, Version 2.0 (the "License");

+@REM you may not use this file except in compliance with the License.

+@REM You may obtain a copy of the License at

+@REM

+@REM         http://www.apache.org/licenses/LICENSE-2.0

+@REM

+@REM Unless required by applicable law or agreed to in writing, software

+@REM distributed under the License is distributed on an "AS IS" BASIS,

+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+@REM See the License for the specific language governing permissions and

+@REM limitations under the License.

+@REM

+@echo off

+title catalog

+

+set RUNHOME=%~dp0

+echo ##RUNHOME %RUNHOME%

+

+

+echo ### Starting catalog

+start /D %RUNHOME%catalog run.bat

+

+echo ### Starting tomcat

+start /D %RUNHOME%tomcat bin\startup.bat 

+

diff --git a/catalog-core/distribution/catalog-all/src/main/assembly/startup.sh b/catalog-core/distribution/catalog-all/src/main/assembly/startup.sh
new file mode 100644
index 00000000..212ebdea
--- /dev/null
+++ b/catalog-core/distribution/catalog-all/src/main/assembly/startup.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+#
+# Licensed 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.
+#
+DIRNAME=`dirname $0`
+RUNHOME=`cd $DIRNAME/; pwd`
+echo @RUNHOME@ $RUNHOME
+
+echo "### Starting catalog";
+cd catalog
+./run.sh &
+cd $RUNHOME
+
+
+echo "\n\n### Starting catalog-http server"
+cd ./tomcat
+./bin/startup.sh &
+echo "### Starting catalog end...";
+
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml
index 14deab79..1cd7d3a0 100644
--- a/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml
@@ -42,7 +42,7 @@ database:
   password: catalog

 

   # the JDBC URL

-  url: jdbc:mysql://10.74.148.157:3306/catalog

+  url: jdbc:mysql://127.0.0.1:3306/catalog

 #LDAP

 ldapServerIp: 127.0.0.1

 ldapServerPort: 20096

@@ -63,7 +63,7 @@ server:
   adminContextPath: /admin

   connector:

     type: http

-    port: 8212

+    port: 8200

 

 # Logging settings.

 logging:

diff --git a/catalog-core/httpserver/src/main/assembly/tomcat/conf/server.xml b/catalog-core/httpserver/src/main/assembly/tomcat/conf/server.xml
new file mode 100644
index 00000000..7d12c6ce
--- /dev/null
+++ b/catalog-core/httpserver/src/main/assembly/tomcat/conf/server.xml
@@ -0,0 +1,144 @@
+<?xml version='1.0' encoding='utf-8'?>

+<!--

+  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.

+-->

+<!-- Note:  A "Server" is not itself a "Container", so you may not

+     define subcomponents such as "Valves" at this level.

+     Documentation at /docs/config/server.html

+ -->

+<Server port="8005" shutdown="SHUTDOWN">

+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />

+  <!-- Security listener. Documentation at /docs/config/listeners.html

+  <Listener className="org.apache.catalina.security.SecurityListener" />

+  -->

+  <!--APR library loader. Documentation at /docs/apr.html -->

+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />

+  <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->

+  <Listener className="org.apache.catalina.core.JasperListener" />

+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->

+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />

+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />

+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />

+

+  <!-- Global JNDI resources

+       Documentation at /docs/jndi-resources-howto.html

+  -->

+  <GlobalNamingResources>

+    <!-- Editable user database that can also be used by

+         UserDatabaseRealm to authenticate users

+    -->

+    <Resource name="UserDatabase" auth="Container"

+              type="org.apache.catalina.UserDatabase"

+              description="User database that can be updated and saved"

+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"

+              pathname="conf/tomcat-users.xml" />

+  </GlobalNamingResources>

+

+  <!-- A "Service" is a collection of one or more "Connectors" that share

+       a single "Container" Note:  A "Service" is not itself a "Container",

+       so you may not define subcomponents such as "Valves" at this level.

+       Documentation at /docs/config/service.html

+   -->

+  <Service name="Catalina">

+

+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->

+    <!--

+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"

+        maxThreads="150" minSpareThreads="4"/>

+    -->

+

+

+    <!-- A "Connector" represents an endpoint by which requests are received

+         and responses are returned. Documentation at :

+         Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)

+         Java AJP  Connector: /docs/config/ajp.html

+         APR (HTTP/AJP) Connector: /docs/apr.html

+         Define a non-SSL HTTP/1.1 Connector on port 8080

+    -->

+    <Connector port="8201" protocol="HTTP/1.1"

+               connectionTimeout="20000"

+               redirectPort="8443" />

+    <!-- A "Connector" using the shared thread pool-->

+    <!--

+    <Connector executor="tomcatThreadPool"

+               port="8080" protocol="HTTP/1.1"

+               connectionTimeout="20000"

+               redirectPort="8443" />

+    -->

+    <!-- Define a SSL HTTP/1.1 Connector on port 8443

+         This connector uses the BIO implementation that requires the JSSE

+         style configuration. When using the APR/native implementation, the

+         OpenSSL style configuration is required as described in the APR/native

+         documentation -->

+    <!--

+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11Protocol"

+               maxThreads="150" SSLEnabled="true" scheme="https" secure="true"

+               clientAuth="false" sslProtocol="TLS" />

+    -->

+

+    <!-- Define an AJP 1.3 Connector on port 8009 -->

+    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />

+

+

+    <!-- An Engine represents the entry point (within Catalina) that processes

+         every request.  The Engine implementation for Tomcat stand alone

+         analyzes the HTTP headers included with the request, and passes them

+         on to the appropriate Host (virtual host).

+         Documentation at /docs/config/engine.html -->

+

+    <!-- You should set jvmRoute to support load-balancing via AJP ie :

+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">

+    -->

+    <Engine name="Catalina" defaultHost="localhost">

+

+      <!--For clustering, please take a look at documentation at:

+          /docs/cluster-howto.html  (simple how to)

+          /docs/config/cluster.html (reference documentation) -->

+      <!--

+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>

+      -->

+

+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords

+           via a brute-force attack -->

+      <Realm className="org.apache.catalina.realm.LockOutRealm">

+        <!-- This Realm uses the UserDatabase configured in the global JNDI

+             resources under the key "UserDatabase".  Any edits

+             that are performed against this UserDatabase are immediately

+             available for use by the Realm.  -->

+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"

+               resourceName="UserDatabase"/>

+      </Realm>

+

+      <Host name="localhost"  appBase="webapps"

+            unpackWARs="true" autoDeploy="true">

+

+        <!-- SingleSignOn valve, share authentication between web applications

+             Documentation at: /docs/config/valve.html -->

+        <!--

+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />

+        -->

+

+        <!-- Access log processes all example.

+             Documentation at: /docs/config/valve.html

+             Note: The pattern used is equivalent to using pattern="common" -->

+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"

+               prefix="localhost_access_log." suffix=".txt"

+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />

+

+      </Host>

+    </Engine>

+  </Service>

+</Server>