diff options
Diffstat (limited to 'servicegateway')
25 files changed, 244 insertions, 620 deletions
diff --git a/servicegateway/deployment/pom.xml b/servicegateway/deployment/pom.xml index e415c55b..6f7f7ae7 100644 --- a/servicegateway/deployment/pom.xml +++ b/servicegateway/deployment/pom.xml @@ -1,3 +1,18 @@ +<!-- + Copyright 2016 Huawei Technologies Co., Ltd. + + 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. +--> <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/servicegateway/deployment/src/main/release/Swagger.json b/servicegateway/deployment/src/main/release/Swagger.json index 211a954b..c25187fd 100644 --- a/servicegateway/deployment/src/main/release/Swagger.json +++ b/servicegateway/deployment/src/main/release/Swagger.json @@ -1,3 +1,18 @@ +/* + * Copyright 2016 Huawei Technologies Co., Ltd. + * + * 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. + */ { "swagger": "2.0", "info": { diff --git a/servicegateway/deployment/src/main/release/bin/start.sh b/servicegateway/deployment/src/main/release/bin/start.sh index ffb45280..235b3197 100644 --- a/servicegateway/deployment/src/main/release/bin/start.sh +++ b/servicegateway/deployment/src/main/release/bin/start.sh @@ -1,52 +1,19 @@ +#******************************************************************************* +# Copyright 2016 Huawei Technologies Co., Ltd. +# +# 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. +#******************************************************************************* #!/bin/bash -#check user -CUR_PATH=$(cd `dirname $0`;pwd) -SCRIPT_PATH=$0 -IPMC_USER="`stat -c '%U' ${SCRIPT_PATH}`" -export IPMC_USER -CURRENT_USER="`/usr/bin/id -u -n`" -if [ "${IPMC_USER}" != "${CURRENT_USER}" ] -then - echo "only ${IPMC_USER} can execute this script." - exit 1 -fi - -umask 027 - -if [ -z "$JAVA_HOME" ] -then - echo "There is no JAVA_HOME" - exit 1 -fi - -if [ -z "$CATALINA_HOME" ] -then - echo "There is no CATALINA_HOME" - exit 1 -fi - -if [ -z "$APP_ROOT" ] -then - echo "There is no APP_ROOT" - exit 1 -fi - - - -export CATALINA_BASE=$APP_ROOT -export COMPLETE_PROCESS_NAME=$PROCESS_NAME-$NODE_ID-$PROCESS_SLOT -LOG_PATH=$_APP_LOG_DIR/$COMPLETE_PROCESS_NAME - -JAVA_OPTS="-Dfile.encoding=UTF-8" -JAVA_OPTS="$JAVA_OPTS -Dlog.dir=$LOG_PATH" -export TOMCAT_LOG_DIR=$_APP_LOG_DIR/$COMPLETE_PROCESS_NAME/tomcatlog -mkdir -p $TOMCAT_LOG_DIR -export TOMCAT_WORK_DIR=$_APP_SHARE_DIR/$COMPLETE_PROCESS_NAME/tomcatwork -export CATALINA_OUT=$TOMCAT_LOG_DIR/catalina.out -JAVA_OPTS="$JAVA_OPTS -DTOMCAT_LOG_DIR=$TOMCAT_LOG_DIR -DTOMCAT_WORK_DIR=$TOMCAT_WORK_DIR -DNFW=$COMPLETE_PROCESS_NAME -Dprocname=$COMPLETE_PROCESS_NAME " -export JAVA_OPTS="$JAVA_OPTS -server -Xms32m -Xmx256m -XX:InitialCodeCacheSize=32m -XX:ReservedCodeCacheSize=64m -XX:MetaspaceSize=32m -XX:MaxMetaspaceSize=128m -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=62 -XX:-UseLargePages -XX:+UseFastAccessorMethods -XX:+CMSClassUnloadingEnabled -Dbsp.app.datasource=ServiceGatewaydb" -export LOGGING_CONFIG="-DNFW=$COMPLETE_PROCESS_NAME -Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties" - -$CATALINA_HOME/bin/catalina.sh start - -result=0;$CUR_PATH/../../../../manager/agent/tools/shscript/syslogutils.sh "$(basename $0)" "$result" "Execute($#):$CUR_PATH/$0 $@";exit $result +cd .. +export CATALINA_BASE=$(cd `dirname $0`; pwd) +catalina.sh start
\ No newline at end of file diff --git a/servicegateway/deployment/src/main/release/bin/stop.sh b/servicegateway/deployment/src/main/release/bin/stop.sh index 9ac855f0..bcc60433 100644 --- a/servicegateway/deployment/src/main/release/bin/stop.sh +++ b/servicegateway/deployment/src/main/release/bin/stop.sh @@ -1,15 +1,19 @@ +#******************************************************************************* +# Copyright 2016 Huawei Technologies Co., Ltd. +# +# 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. +#******************************************************************************* #!/bin/bash -#check user -CUR_PATH=$(cd `dirname $0`;pwd) -SCRIPT_PATH=$0 -IPMC_USER="`stat -c '%U' ${SCRIPT_PATH}`" -export IPMC_USER -CURRENT_USER="`/usr/bin/id -u -n`" -if [ "${IPMC_USER}" != "${CURRENT_USER}" ] -then - echo "only ${IPMC_USER} can execute this script." - exit 1 -fi -kill -9 $PID - -result=0;$CUR_PATH/../../../../manager/agent/tools/shscript/syslogutils.sh "$(basename $0)" "$result" "Execute($#):$CUR_PATH/$0 $@";exit $result +cd .. +export CATALINA_BASE=$(cd `dirname $0`; pwd) +catalina.sh stop
\ No newline at end of file diff --git a/servicegateway/deployment/src/main/release/conf/catalina.policy b/servicegateway/deployment/src/main/release/conf/catalina.policy index 244334e7..89f49d83 100644 --- a/servicegateway/deployment/src/main/release/conf/catalina.policy +++ b/servicegateway/deployment/src/main/release/conf/catalina.policy @@ -1,32 +1,18 @@ -// 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. - -// ============================================================================ -// catalina.policy - Security Policy Permissions for Tomcat 7 -// -// This file contains a default set of security policies to be enforced (by the -// JVM) when Catalina is executed with the "-security" option. In addition -// to the permissions granted here, the following additional permissions are -// granted to each web application: -// -// * Read access to the web application's document root directory -// * Read, write and delete access to the web application's working directory -// ============================================================================ - - -// ========== SYSTEM CODE PERMISSIONS ========================================= +/* + * Copyright 2016 Huawei Technologies Co., Ltd. + * + * 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. + */ // These permissions apply to javac diff --git a/servicegateway/deployment/src/main/release/conf/catalina.properties b/servicegateway/deployment/src/main/release/conf/catalina.properties index ef375e1d..a833f711 100644 --- a/servicegateway/deployment/src/main/release/conf/catalina.properties +++ b/servicegateway/deployment/src/main/release/conf/catalina.properties @@ -1,12 +1,11 @@ -# 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 -# +# Copyright 2016 Huawei Technologies Co., Ltd. + +# 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. diff --git a/servicegateway/deployment/src/main/release/conf/context.xml b/servicegateway/deployment/src/main/release/conf/context.xml index 79ad60d5..2c8f59cc 100644 --- a/servicegateway/deployment/src/main/release/conf/context.xml +++ b/servicegateway/deployment/src/main/release/conf/context.xml @@ -1,11 +1,19 @@ <?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. --> +<!-- + Copyright 2016 Huawei Technologies Co., Ltd. + + 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. +--> <!-- The contents of this file will be loaded for each web application --> <Context> diff --git a/servicegateway/deployment/src/main/release/conf/server.xml b/servicegateway/deployment/src/main/release/conf/server.xml index ffd05e81..40eb5ff0 100644 --- a/servicegateway/deployment/src/main/release/conf/server.xml +++ b/servicegateway/deployment/src/main/release/conf/server.xml @@ -1,92 +1,46 @@ -<?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="-1" shutdown="SHUTDOWN"> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2016 Huawei Technologies Co., Ltd. + + 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. +--> +<!-- 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="8306" 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 SSLEngine="on" className="org.apache.catalina.core.AprLifecycleListener" /> <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" /> + <Resource auth="Container" description="User database that can be updated and saved" factory="org.apache.catalina.users.MemoryUserDatabaseFactory" + name="UserDatabase" pathname="conf/tomcat-users.xml" type="org.apache.catalina.UserDatabase" /> </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/TLS HTTP/1.1 Connector on port 8080 --> - - <Connector port="8300" protocol="org.openo.cloudsop.initconfig.tool.CustomHttp11Protocol" scheme="https" - sslEnabledProtocols="TLSv1.2" connectionTimeout="20000" maxPostSize="2097152" maxHttpHeaderSize="8192" - allowTrace="false" /> - - <!-- A "Connector" using the shared thread pool --> - <!-- <Connector executor="tomcatThreadPool" port="8080" protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="8443" - /> --> - <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 This connector uses the NIO 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.Http11NioProtocol" maxThreads="150" SSLEnabled="true" - scheme="https" secure="true" clientAuth="false" sslProtocol="TLS" /> --> - - <!-- Define an AJP 1.3 Connector on port 8009 --> - <!-- <Connector port="18009" 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 --> + <Connector connectionTimeout="20000" port="8503" protocol="HTTP/1.1" redirectPort="8443" /> + <Connector port="8305" protocol="AJP/1.3" redirectPort="8443" /> + <Engine defaultHost="localhost" name="Catalina"> <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="false" deployOnStartup="false"> - <!-- SingleSignOn valve, share authentication between web applications Documentation at: /docs/config/valve.html --> - <!-- <Valve className="org.apache.catalina.authenticator.SingleSignOn" /> --> - <Context path="/" reloadable="false" docBase="ROOT" workDir="${TOMCAT_WORK_DIR}"> - <Manager className="com.huawei.cloudsop.tomcat.api.session.StandardManagerExt" /> - </Context> - <!-- Access log processes all example. Documentation at: /docs/config/valve.html Note: The pattern used is - equivalent to using pattern="common" --> - <Valve className="com.huawei.cloudsop.tomcat.api.log.AccessLogValveExt" pattern="%h %l %u %t "%r" %s %b %{x-request-id}i" /> - + <Host appBase="webapps" autoDeploy="true" name="localhost" unpackWARs="true"> + <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" + pattern="%h %l %u %t "%r" %s %b" prefix="localhost_access_log" suffix=".txt" /> + <Context docBase="ROOT" path="" reloadable="true" /> </Host> </Engine> </Service> -</Server> +</Server>
\ No newline at end of file diff --git a/servicegateway/deployment/src/main/release/conf/web.xml b/servicegateway/deployment/src/main/release/conf/web.xml index c7636006..4cd9d09e 100644 --- a/servicegateway/deployment/src/main/release/conf/web.xml +++ b/servicegateway/deployment/src/main/release/conf/web.xml @@ -1,11 +1,19 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- 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. --> +<!-- + Copyright 2016 Huawei Technologies Co., Ltd. + + 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. +--> <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" diff --git a/servicegateway/deployment/src/main/release/etc/conf/restclient.json b/servicegateway/deployment/src/main/release/etc/conf/restclient.json index 304e2137..b886bc9a 100644 --- a/servicegateway/deployment/src/main/release/etc/conf/restclient.json +++ b/servicegateway/deployment/src/main/release/etc/conf/restclient.json @@ -1,3 +1,18 @@ +/*
+ * Copyright 2016 Huawei Technologies Co., Ltd.
+ *
+ * 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.
+ */
{
"defaultServer":
{
diff --git a/servicegateway/deployment/src/main/release/etc/framework/tracker.properties b/servicegateway/deployment/src/main/release/etc/framework/tracker.properties deleted file mode 100644 index 68eddf2f..00000000 --- a/servicegateway/deployment/src/main/release/etc/framework/tracker.properties +++ /dev/null @@ -1 +0,0 @@ -roa.tracker.class=org.openo.gso.commonsvc.servicegateway.talc.impl.TrackerManagerImpl diff --git a/servicegateway/deployment/src/main/release/etc/log4j/log4j-app.properties b/servicegateway/deployment/src/main/release/etc/log4j/log4j-app.properties deleted file mode 100644 index 1653372a..00000000 --- a/servicegateway/deployment/src/main/release/etc/log4j/log4j-app.properties +++ /dev/null @@ -1,50 +0,0 @@ -log4j.rootLogger=WARN,root -log4j.logger.access=WARN,access -log4j.logger.org.openo.baseservice.log4operation.System=info,log4operation -log4j.logger.org.openo.baseservice.base.launcher=info,apploader -log4j.logger.org.openo.baseservice.framework.appmgr=info,apploader -log4j.logger.org.openo.baseservice.framework.apploader=info,apploader -log4j.logger.org.openo.baseservice.framework.appmgrimpl=info,apploader - -log4j.additivity.access=true -log4j.additivity.org.openo.baseservice.log4operation.System=false -log4j.additivity.org.openo.baseservice.base.launcher=false -log4j.additivity.org.openo.baseservice.framework.appmgr=false -log4j.additivity.org.openo.baseservice.framework.apploader=false -log4j.additivity.org.openo.baseservice.framework.appmgrimpl=false - -log4j.appender.access.Append=true -log4j.appender.access.File=log/access -log4j.appender.access.layout.ConversionPattern=%d %-5p [%t][%X{moduleID}][%C %L] %m%n -log4j.appender.access.layout=org.apache.log4j.PatternLayout -log4j.appender.access.MaxBackupIndex=50 -log4j.appender.access.MaxFileSize=20MB -log4j.appender.access=org.openo.baseservice.log4j.extend.OssRollingFileAppender - - -log4j.appender.root.Append=true -log4j.appender.root.File=log/root -log4j.appender.root.layout.ConversionPattern=%d %-5p [%t][%X{moduleID}][%C %L] %m%n -log4j.appender.root.layout=org.apache.log4j.PatternLayout -log4j.appender.root.MaxBackupIndex=50 -log4j.appender.root.MaxFileSize=20MB -log4j.appender.root=org.openo.baseservice.log4j.extend.OssRollingFileAppender - - -log4j.appender.log4operation=org.openo.baseservice.log4j.extend.OssRollingFileAppender -log4j.appender.log4operation.useNewThread4Zip=false -log4j.appender.log4operation.File=operation/log4operation-System -log4j.appender.log4operation.MaxFileSize=10MB -log4j.appender.log4operation.MaxBackupIndex=10 -log4j.appender.log4operation.layout=org.apache.log4j.PatternLayout -log4j.appender.log4operation.layout.ConversionPattern=%d %p [%c] - %m%n -log4j.appender.log4operation.permission=600 - -log4j.appender.apploader=org.openo.baseservice.log4j.extend.OssRollingFileAppender -log4j.appender.apploader.File=log/apploader -log4j.appender.apploader.MaxFileSize=50MB -log4j.appender.apploader.MaxBackupIndex=30 -log4j.appender.apploader.Append=true -log4j.appender.apploader.layout=org.apache.log4j.PatternLayout -log4j.appender.apploader.layout.ConversionPattern=%d %-5p [%t][%X{moduleID}][%C %L] %m%n -log4j.appender.apploader.moduleID=Apploader diff --git a/servicegateway/deployment/src/main/release/etc/platformversion.xml b/servicegateway/deployment/src/main/release/etc/platformversion.xml deleted file mode 100644 index add9ab01..00000000 --- a/servicegateway/deployment/src/main/release/etc/platformversion.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<config name="version"> - <param name="PLATFORM_VERSION">CloudSOP @{PLATFORM_VERSION}</param> - <param name="VERSION_TIME">@{VERSION_TIME}</param> -</config> diff --git a/servicegateway/deployment/src/main/release/etc/register/service.json b/servicegateway/deployment/src/main/release/etc/register/service.json index 5d32dd06..565342e4 100644 --- a/servicegateway/deployment/src/main/release/etc/register/service.json +++ b/servicegateway/deployment/src/main/release/etc/register/service.json @@ -1,3 +1,18 @@ +/*
+ * Copyright 2016 Huawei Technologies Co., Ltd.
+ *
+ * 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.
+ */
{
"serviceName" : "servicegateway",
"version" : "v1",
@@ -7,7 +22,7 @@ "nodes" : [
{
"ip" : "getInputIP",
- "port" : "8301",
+ "port" : "8305",
"ttl" : 0
}
]
diff --git a/servicegateway/deployment/src/main/release/init/post_install.sh b/servicegateway/deployment/src/main/release/init/post_install.sh deleted file mode 100644 index 959acc51..00000000 --- a/servicegateway/deployment/src/main/release/init/post_install.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -#check user -if [ "root" = "`/usr/bin/id -u -n`" ];then - echo "root has been forbidden to execute the shell." - exit 1 -fi - -if [[ -z ${APP_ROOT} ]];then - echo "APP_ROOT is empty." - exit 1 -fi - -if [[ -z ${_APP_LOG_DIR} ]];then - echo "_APP_LOG_DIR is empty." - exit 1 -fi - -#HORNETQ_CONF=$APP_ROOT/etc - -#chmod 400 $HORNETQ_CONF/engine.json diff --git a/servicegateway/deployment/src/main/release/pub/app_define.json b/servicegateway/deployment/src/main/release/pub/app_define.json deleted file mode 100644 index 83f9f9d2..00000000 --- a/servicegateway/deployment/src/main/release/pub/app_define.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "fileVersion": "1", - "name": "ServiceGateway", - "description": "ServiceGateway", - "requireDiskSize": 50, - "rtspSoftLink": true, - "upgrade": { - "use": { - "jre": "~1.3" - }, - "postInstall": { - "command": [ - "${APP_ROOT}/init/post_install.sh" - ], - "timeout": 300 - }, - "check": { - "command": [ - "${APP_ROOT}/upgrade/check.sh" - ], - "timeout": 30 - }, - "upgrade": { - "command": [ - "${APP_ROOT}/upgrade/init.sh" - ], - "timeout": 300 - } - }, - "processes": { - "ServiceGateway": { - "use": { - "jre": "~1.3", - "tomcat": "~9.0" - }, - "subscribes": [ - { - "name": "iamcacheproxy", - "srv_ctx": {}, - "ins_ctx": {} - }, - { - "name": "iamcore", - "srv_ctx": {}, - "ins_ctx": {} - } - ], - "mode": "cluster", - "cpu": 0.5, - "memory": 1024, - "memoryLimit": 4096, - "patterns": [ - "!/rest/ServiceGateway/v1", - "/rest/ServiceGateway_portal/v1" - ], - "useAdditionalEnv": [ - "_APP_LOG_DIR", - "_APP_TMP_DIR", - "_APP_SHARE_DIR" - ], - "protocols": { - "IR": "http" - }, - "commands": { - "start": [ - "${APP_ROOT}/bin/start.sh" - ], - "stop": [ - "${APP_ROOT}/bin/stop.sh" - ] - } - } - }, - "databases": { - "ServiceGatewaydb": { - "type": [ - "mysql" - ], - "serviceName": "ServiceGatewaydb", - "dataSize": 4096, - "logSize": 128, - "sharding": false, - "defaultShardingNumber": 1 - } - }, - "redis": { - "ServiceGatewayrdb": { - "serviceName": "ServiceGatewayrdb", - "type": "cache", - "memory": 1024, - "dataSize": 1024, - "sharding": false, - "defaultShardingNumber": 1, - "protected": true - } - } -} diff --git a/servicegateway/deployment/src/main/release/pub/i18n/en_US/app_define.properties b/servicegateway/deployment/src/main/release/pub/i18n/en_US/app_define.properties deleted file mode 100644 index 6918a8bf..00000000 --- a/servicegateway/deployment/src/main/release/pub/i18n/en_US/app_define.properties +++ /dev/null @@ -1,80 +0,0 @@ -servicemgr.bad_param_desc=Invalid Param -servicemgr.bad_param_detail=Invalid Param. -servicemgr.bad_param_reason=Invalid Param -servicemgr.bad_param_advice=Invalid Param -servicemgr.service.status_inprogress_desc=The service status is in process, can not operate it. -servicemgr.service.status_inprogress_detail=The service status is in process, can not operate it. -servicemgr.service.status_inprogress_reason=The service status is in process, can not operate it. -servicemgr.service.status_inprogress_advice=Can not operate service when service status is in progress. -servicemgr.service.status_active_desc=The service status is active, activate or delete service is not permitted. -servicemgr.service.status_active_detail=The service status is active, activate or delete service is not permitted. -servicemgr.service.status_active_reason=The service status is active, activate or delete service is not permitted. -servicemgr.service.status_active_advice=Can not activate or delete service when service status is active. -servicemgr.service.status_deactive_desc=The service status is deactive, deactivate service is not permitted. -servicemgr.service.status_deactive_detail=The service status is deactive, deactivate service is not permitted. -servicemgr.service.status_deactive_reason=The service status is deactive, deactivate service is not permitted. -servicemgr.service.status_deactive_advice=Can not deactive service when service status service is deactive. -servicemgr.mysql.oper_mysql_db_error_desc=Operate mysql database error. -servicemgr.mysql.oper_mysql_db_error_detail=Operate mysql database error. -servicemgr.mysql.oper_mysql_db_error_reason=Operate mysql database error. -servicemgr.mysql.oper_mysql_db_error_advice=Operate mysql database error. -servicemgr.redis.oper_redis_db_error_desc=Operate redis error. -servicemgr.redis.oper_redis_db_error_reason=Operate redis error. -servicemgr.redis.oper_redis_db_error_detail=Operate redis error. -servicemgr.redis.oper_redis_db_error_advice=Operate redis error. -servicemgr.db.oper_db_error_desc=Operate database error. -servicemgr.db.oper_db_error_detail=Operate database error. -servicemgr.db.oper_db_error_reason=Operate database error. -servicemgr.db.oper_db_error_advice=Operate database error. -servicemgr.service.not_exist_desc=Service is not exist, can not operate it. -servicemgr.service.not_exist_detail=Service is not exist, can not operate it. -servicemgr.service.not_exist_reason=Service is not exist, can not operate it. -servicemgr.service.not_exist_advice=Service is not exist, can not operate it. -servicemgr.service.status_param_error_desc=The parameter of service status is error, can not operate it. -servicemgr.service.status_param_error_detail=The parameter of service status is error, can not operate it. -servicemgr.service.status_param_error_reason=The parameter of service status is error, can not operate it. -servicemgr.service.status_param_error_advice=The parameter of service status is error, can not operate it. -servicemgr.service.service_package_status_inactive_desc=The service package status is offline. -servicemgr.service.service_package_status_inactive_detail=The service package status is offline. -servicemgr.service.service_package_status_inactive_reason=The service package status is offline. -servicemgr.service.service_package_status_inactive_advice=Online the service package firstly. -servicemgr.service.service_package_status_delete_depending_desc=The Service Package is delete pending, can't do the action. -servicemgr.service.service_package_status_delete_depending_detail=The Service Package is delete pending, can't do the action. -servicemgr.service.service_package_status_delete_depending_reason=The Service Package is delete pending, can't do the action. -servicemgr.service.service_package_status_delete_depending_advice=The Service Package is delete pending, can't do the action. -servicemgr.servicePackage.not_activation_desc=The service package status is incorrect. -servicemgr.servicePackage.not_activation_detail=The service package status is incorrect. -servicemgr.servicePackage.not_activation_reason=The service package status is incorrect. -servicemgr.servicePackage.not_activation_advice=The service package status is incorrect, can not operate it. -servicemgr.servicePageExtend.not_exist_desc=The service_page_extend is not exist, can not operate it. -servicemgr.servicePageExtend.not_exist_detail=The service_page_extend is not exist, can not operate it. -servicemgr.servicePageExtend.not_exist_reason=The service_page_extend is not exist, can not operate it. -servicemgr.servicePageExtend.not_exist_advice=The service_page_extend is not exist, can not operate it. -servicemgr.service.create_failed_desc=Service create failed, only deleting operation is permitted. -servicemgr.service.create_failed_detail=Service create failed, only deleting operation is permitted. -servicemgr.service.create_failed_reason=Service create failed, only deleting operation is permitted. -servicemgr.service.create_failed_advice=Service create failed, only deleting operation is permitted. -servicemgr.service.parameter.validate_error_desc=Service parameter validate failed. -servicemgr.service.parameter.validate_error_detail=Service parameter validate failed. -servicemgr.service.parameter.validate_error_reason=Service parameter validate failed. -servicemgr.service.parameter.validate_error_advice=Service parameter validate failed. -servicemgr.service.template.parse_error_desc=Template parse error. -servicemgr.service.template.parse_error_detail=Template parse error. -servicemgr.service.template.parse_error_reason=Template parse error. -servicemgr.service.template.parse_error_advice=Template parse error. -servicemgr.permission_denied_desc=Incorrect password. -servicemgr.permission_denied_detail=Incorrect password. -servicemgr.permission_denied_reason=Incorrect password. -servicemgr.permission_denied_advice=Incorrect password. -servicemgr.template.not_exist_desc=The template does not exist. -servicemgr.template.not_exist_detail=The template does not exist. -servicemgr.template.not_exist_reason=The template does not exist. -servicemgr.template.not_exist_advice=The template does not exist. -servicemgr.service.exist_desc=Service is exist. -servicemgr.service.exist_detail=Service is exist. -servicemgr.service.exist_reason=Service is exist. -servicemgr.service.exist_advice=Service is exist. -servicemgr.template.parameter.not_exist_desc=The parameters of template does not exist. -servicemgr.template.parameter.not_exis_detail=The parameters of template does not exist. -servicemgr.template.parameter.not_exis_reason=The parameters of template does not exist. -servicemgr.template.parameter.not_exis_advice=The parameters of template does not exist. diff --git a/servicegateway/deployment/src/main/release/pub/i18n/zh_CN/app_define.properties b/servicegateway/deployment/src/main/release/pub/i18n/zh_CN/app_define.properties deleted file mode 100644 index b6ab626b..00000000 --- a/servicegateway/deployment/src/main/release/pub/i18n/zh_CN/app_define.properties +++ /dev/null @@ -1,83 +0,0 @@ -name=ServiceGateway -description=\u63d0\u4f9b\u8054\u673a\u5e2e\u52a9\u3002 -servicemgr.bad_param_desc=\u53c2\u6570\u9519\u8bef -servicemgr.bad_param_detail=\u53c2\u6570\u9519\u8bef\u3002 -servicemgr.bad_param_reason=\u53c2\u6570\u9519\u8bef -servicemgr.bad_param_advice=\u53c2\u6570\u9519\u8bef -servicemgr.service.status_inprogress_desc=\u5f53\u524d\u4e1a\u52a1\u6b63\u5728\u5904\u7406\u4e2d\u65f6\uff0c\u4e0d\u80fd\u8fdb\u884c\u64cd\u4f5c\u3002 -servicemgr.service.status_inprogress_detail=\u5f53\u524d\u4e1a\u52a1\u6b63\u5728\u5904\u7406\u4e2d\u65f6\uff0c\u4e0d\u80fd\u8fdb\u884c\u64cd\u4f5c\u3002 -servicemgr.service.status_inprogress_reason=\u5f53\u524d\u4e1a\u52a1\u6b63\u5728\u5904\u7406\u4e2d\u65f6\uff0c\u4e0d\u80fd\u8fdb\u884c\u64cd\u4f5c\u3002 -servicemgr.service.status_inprogress_advice=\u5f53\u524d\u4e1a\u52a1\u6b63\u5728\u5904\u7406\u4e2d\u65f6\uff0c\u4e0d\u80fd\u8fdb\u884c\u64cd\u4f5c\u3002 -servicemgr.service.status_active_desc=\u4e1a\u52a1\u4e3a\u6fc0\u6d3b\u72b6\u6001\uff0c\u4e0d\u652f\u6301\u6fc0\u6d3b\u6216\u5220\u9664\u64cd\u4f5c\u3002 -servicemgr.service.status_active_detail=\u4e1a\u52a1\u4e3a\u6fc0\u6d3b\u72b6\u6001\uff0c\u4e0d\u652f\u6301\u6fc0\u6d3b\u6216\u5220\u9664\u64cd\u4f5c\u3002 -servicemgr.service.status_active_reason=\u4e1a\u52a1\u4e3a\u6fc0\u6d3b\u72b6\u6001\uff0c\u4e0d\u652f\u6301\u6fc0\u6d3b\u6216\u5220\u9664\u64cd\u4f5c\u3002 -servicemgr.service.status_active_advice=\u4e1a\u52a1\u4e3a\u6fc0\u6d3b\u72b6\u6001\uff0c\u4e0d\u652f\u6301\u6fc0\u6d3b\u6216\u5220\u9664\u64cd\u4f5c\u3002 -servicemgr.service.status_deactive_desc=\u4e1a\u52a1\u4e3a\u53bb\u6fc0\u6d3b\u72b6\u6001\uff0c\u4e0d\u652f\u6301\u53bb\u6fc0\u6d3b\u64cd\u4f5c\u3002 -servicemgr.service.status_deactive_detail=\u4e1a\u52a1\u4e3a\u53bb\u6fc0\u6d3b\u72b6\u6001\uff0c\u4e0d\u652f\u6301\u53bb\u6fc0\u6d3b\u64cd\u4f5c\u3002 -servicemgr.service.status_deactive_reason=\u4e1a\u52a1\u4e3a\u53bb\u6fc0\u6d3b\u72b6\u6001\uff0c\u4e0d\u652f\u6301\u53bb\u6fc0\u6d3b\u64cd\u4f5c\u3002 -servicemgr.service.status_deactive_advice=\u4e1a\u52a1\u4e3a\u53bb\u6fc0\u6d3b\u72b6\u6001\uff0c\u4e0d\u652f\u6301\u53bb\u6fc0\u6d3b\u64cd\u4f5c\u3002 -servicemgr.mysql.oper_mysql_db_error_desc=\u64cd\u4f5c\u5173\u7cfb\u6570\u636e\u5e93\u5931\u8d25\u3002 -servicemgr.mysql.oper_mysql_db_error_detail=\u64cd\u4f5c\u5173\u7cfb\u6570\u636e\u5e93\u5931\u8d25\u3002 -servicemgr.mysql.oper_mysql_db_error_reason=\u64cd\u4f5c\u5173\u7cfb\u6570\u636e\u5e93\u5931\u8d25\u3002 -servicemgr.mysql.oper_mysql_db_error_advice=\u64cd\u4f5c\u5173\u7cfb\u6570\u636e\u5e93\u5931\u8d25\u3002 -servicemgr.redis.oper_redis_db_error_desc=\u64cd\u4f5c\u7f13\u5b58\u6570\u636e\u5e93\u5931\u8d25\u3002 -servicemgr.redis.oper_redis_db_error_reason=\u64cd\u4f5c\u7f13\u5b58\u6570\u636e\u5e93\u5931\u8d25\u3002 -servicemgr.redis.oper_redis_db_error_detail=\u64cd\u4f5c\u7f13\u5b58\u6570\u636e\u5e93\u5931\u8d25\u3002 -servicemgr.redis.oper_redis_db_error_advice=\u64cd\u4f5c\u7f13\u5b58\u6570\u636e\u5e93\u5931\u8d25\u3002 -servicemgr.db.oper_db_error_desc=\u64cd\u4f5c\u6570\u636e\u5e93\u5931\u8d25\u3002 -servicemgr.db.oper_db_error_detail=\u64cd\u4f5c\u6570\u636e\u5e93\u5931\u8d25\u3002 -servicemgr.db.oper_db_error_reason=\u64cd\u4f5c\u6570\u636e\u5e93\u5931\u8d25\u3002 -servicemgr.db.oper_db_error_advice=\u64cd\u4f5c\u6570\u636e\u5e93\u5931\u8d25\u3002 -servicemgr.service.not_exist_desc=\u4e1a\u52a1\u4e0d\u5b58\u5728\uff0c\u4e0d\u80fd \u8fdb\u884c\u64cd\u4f5c\u3002 -servicemgr.service.not_exist_detail=\u4e1a\u52a1\u4e0d\u5b58\u5728\uff0c\u4e0d\u80fd \u8fdb\u884c\u64cd\u4f5c\u3002 -servicemgr.service.not_exist_reason=\u4e1a\u52a1\u4e0d\u5b58\u5728\uff0c\u4e0d\u80fd \u8fdb\u884c\u64cd\u4f5c\u3002 -servicemgr.service.not_exist_advice=\u4e1a\u52a1\u4e0d\u5b58\u5728\uff0c\u4e0d\u80fd \u8fdb\u884c\u64cd\u4f5c\u3002 -servicemgr.service.status_param_error_desc=\u4e1a\u52a1\u72b6\u6001\u53c2\u6570\u5f02\u5e38\u3002 -servicemgr.service.status_param_error_detail=\u4e1a\u52a1\u72b6\u6001\u53c2\u6570\u5f02\u5e38\u3002 -servicemgr.service.status_param_error_reason=\u4e1a\u52a1\u72b6\u6001\u53c2\u6570\u5f02\u5e38\u3002 -servicemgr.service.status_param_error_advice=\u4e1a\u52a1\u72b6\u6001\u53c2\u6570\u5f02\u5e38\u3002 -servicemgr.service.service_package_status_inactive_desc=\u5f53\u524d\u4e1a\u52a1\u5305\u4e3a\u4e0b\u7ebf\u72b6\u6001\uff0c\u4e0d\u5141\u8bb8\u64cd\u4f5c\u3002 -servicemgr.service.service_package_status_inactive_detail=\u5f53\u524d\u4e1a\u52a1\u5305\u4e3a\u4e0b\u7ebf\u72b6\u6001\uff0c\u4e0d\u5141\u8bb8\u64cd\u4f5c\u3002 -servicemgr.service.service_package_status_inactive_reason=\u5f53\u524d\u4e1a\u52a1\u5305\u4e3a\u4e0b\u7ebf\u6d3b\u72b6\u6001\uff0c\u4e0d\u5141\u8bb8\u64cd\u4f5c\u3002 -servicemgr.service.service_package_status_inactive_advice=\u5f53\u524d\u4e1a\u52a1\u5305\u4e3a\u4e0b\u7ebf\u6d3b\u72b6\u6001\uff0c\u4e0d\u5141\u8bb8\u64cd\u4f5c\u3002 -servicemgr.service.service_package_status_delete_depending_desc=\u4e1a\u52a1\u5b9a\u4e49\u7684\u72b6\u6001\u662f\u5f85\u5220\u9664\uff0c\u4e0d\u80fd\u6267\u884c\u64cd\u4f5c\u3002\u3002 -servicemgr.service.service_package_status_delete_depending_detail=\u4e1a\u52a1\u5b9a\u4e49\u7684\u72b6\u6001\u662f\u5f85\u5220\u9664\uff0c\u4e0d\u80fd\u6267\u884c\u64cd\u4f5c\u3002\u3002 -servicemgr.service.service_package_status_delete_depending_reason=\u4e1a\u52a1\u5b9a\u4e49\u7684\u72b6\u6001\u662f\u5f85\u5220\u9664\uff0c\u4e0d\u80fd\u6267\u884c\u64cd\u4f5c\u3002\u3002 -servicemgr.service.service_package_status_delete_depending_advice=\u4e1a\u52a1\u5b9a\u4e49\u7684\u72b6\u6001\u662f\u5f85\u5220\u9664\uff0c\u4e0d\u80fd\u6267\u884c\u64cd\u4f5c\u3002\u3002 -servicemgr.servicePackage.not_activation_desc=\u5f53\u524d\u4e1a\u52a1\u5305\u72b6\u6001\u5f02\u5e38\u3002 -servicemgr.servicePackage.not_activation_detail=\u5f53\u524d\u4e1a\u52a1\u5305\u72b6\u6001\u5f02\u5e38\u3002 -servicemgr.servicePackage.not_activation_reason=\u5f53\u524d\u4e1a\u52a1\u5305\u72b6\u6001\u5f02\u5e38\u3002 -servicemgr.servicePackage.not_activation_advice=\u5f53\u524d\u4e1a\u52a1\u5305\u72b6\u6001\u5f02\u5e38\uff0c\u4e0d\u5141\u8bb8\u64cd\u4f5c\u3002 -servicemgr.servicePageExtend.not_exist_desc=\u5f53\u524d\u4e1a\u52a1\u6ce8\u518c\u9875\u9762\u4fe1\u606f\u4e0d\u5b58\u5728\uff0c\u4e0d\u5141\u8bb8\u64cd\u4f5c\u3002 -servicemgr.servicePageExtend.not_exist_detail=\u5f53\u524d\u4e1a\u52a1\u6ce8\u518c\u9875\u9762\u4fe1\u606f\u4e0d\u5b58\u5728\uff0c\u4e0d\u5141\u8bb8\u64cd\u4f5c\u3002 -servicemgr.servicePageExtend.not_exist_reason=\u5f53\u524d\u4e1a\u52a1\u6ce8\u518c\u9875\u9762\u4fe1\u606f\u4e0d\u5b58\u5728\uff0c\u4e0d\u5141\u8bb8\u64cd\u4f5c\u3002 -servicemgr.servicePageExtend.not_exist_advice=\u5f53\u524d\u4e1a\u52a1\u6ce8\u518c\u9875\u9762\u4fe1\u606f\u4e0d\u5b58\u5728\uff0c\u4e0d\u5141\u8bb8\u64cd\u4f5c\u3002 -servicemgr.service.create_failed_desc=\u5f53\u524d\u4e1a\u52a1\u521b\u5efa\u5931\u8d25\uff0c\u53ea\u5141\u8bb8\u5220\u9664\u64cd\u4f5c\u3002 -servicemgr.service.create_failed_detail=\u5f53\u524d\u4e1a\u52a1\u521b\u5efa\u5931\u8d25\uff0c\u53ea\u5141\u8bb8\u5220\u9664\u64cd\u4f5c\u3002 -servicemgr.service.create_failed_reason=\u5f53\u524d\u4e1a\u52a1\u521b\u5efa\u5931\u8d25\uff0c\u53ea\u5141\u8bb8\u5220\u9664\u64cd\u4f5c\u3002 -servicemgr.service.create_failed_advice=\u5f53\u524d\u4e1a\u52a1\u521b\u5efa\u5931\u8d25\uff0c\u53ea\u5141\u8bb8\u5220\u9664\u64cd\u4f5c\u3002 -servicemgr.service.parameter.validate_error_desc=\u4e1a\u52a1\u53c2\u6570\u6821\u9a8c\u5931\u8d25\u3002 -servicemgr.service.parameter.validate_error_detail=\u4e1a\u52a1\u53c2\u6570\u6821\u9a8c\u5931\u8d25\u3002 -servicemgr.service.parameter.validate_error_reason=\u4e1a\u52a1\u53c2\u6570\u6821\u9a8c\u5931\u8d25\u3002 -servicemgr.service.parameter.validate_error_advice=\u4e1a\u52a1\u53c2\u6570\u6821\u9a8c\u5931\u8d25\u3002 -servicemgr.service.template.parse_error_desc=\u6a21\u677f\u89e3\u6790\u5931\u8d25\u3002 -servicemgr.service.template.parse_error_detail=\u6a21\u677f\u89e3\u6790\u5931\u8d25\u3002 -servicemgr.service.template.parse_error_reason=\u6a21\u677f\u89e3\u6790\u5931\u8d25\u3002 -servicemgr.service.template.parse_error_advice=\u6a21\u677f\u89e3\u6790\u5931\u8d25\u3002 -servicemgr.permission_denied_desc=\u5bc6\u7801\u9519\u8bef -servicemgr.permission_denied_detail=\u5bc6\u7801\u9519\u8bef -servicemgr.permission_denied_reason=\u5bc6\u7801\u9519\u8bef -servicemgr.permission_denied_advice=\u5bc6\u7801\u9519\u8bef -servicemgr.template.not_exist=\u6a21\u677f\u4e0d\u5b58\u5728 -servicemgr.template.not_exist_desc=\u6a21\u677f\u4e0d\u5b58\u5728 -servicemgr.template.not_exist_detail=\u6a21\u677f\u4e0d\u5b58\u5728 -servicemgr.template.not_exist_reason=\u6a21\u677f\u4e0d\u5b58\u5728 -servicemgr.template.not_exist_advice=\u6a21\u677f\u4e0d\u5b58\u5728 -servicemgr.service.exist_desc=\u4e1a\u52a1\u5df2\u5b58\u5728\u3002 -servicemgr.service.exist_detail=\u4e1a\u52a1\u5df2\u5b58\u5728\u3002 -servicemgr.service.exist_reason=\u4e1a\u52a1\u5df2\u5b58\u5728\u3002 -servicemgr.service.exist_advice=\u4e1a\u52a1\u5df2\u5b58\u5728\u3002 -servicemgr.template.parameter.not_exist_desc=\u6a21\u677f\u53c2\u6570\u4e0d\u5b58\u5728\u3002 -servicemgr.template.parameter.not_exis_detail=\u6a21\u677f\u53c2\u6570\u4e0d\u5b58\u5728\u3002 -servicemgr.template.parameter.not_exis_reason=\u6a21\u677f\u53c2\u6570\u4e0d\u5b58\u5728\u3002 -servicemgr.template.parameter.not_exis_advice=\u6a21\u677f\u53c2\u6570\u4e0d\u5b58\u5728\u3002
\ No newline at end of file diff --git a/servicegateway/deployment/src/main/release/pub/release_version.properties b/servicegateway/deployment/src/main/release/pub/release_version.properties deleted file mode 100644 index b5b354e5..00000000 --- a/servicegateway/deployment/src/main/release/pub/release_version.properties +++ /dev/null @@ -1 +0,0 @@ -upload_path=Services/ICTO/public diff --git a/servicegateway/deployment/src/main/release/upgrade/check.sh b/servicegateway/deployment/src/main/release/upgrade/check.sh deleted file mode 100644 index d87f29ee..00000000 --- a/servicegateway/deployment/src/main/release/upgrade/check.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -exit 1 diff --git a/servicegateway/deployment/src/main/release/upgrade/init.sh b/servicegateway/deployment/src/main/release/upgrade/init.sh deleted file mode 100644 index 799b7e4a..00000000 --- a/servicegateway/deployment/src/main/release/upgrade/init.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -#check user -CUR_PATH=$(cd `dirname $0`;pwd) -SCRIPT_PATH=$0 -IPMC_USER="`stat -c '%U' ${SCRIPT_PATH}`" -export IPMC_USER -CURRENT_USER="`/usr/bin/id -u -n`" -if [ "${IPMC_USER}" != "${CURRENT_USER}" ] -then - echo "only ${IPMC_USER} can execute this script." - exit 1 -fi -umask 027 - -cd $APP_ROOT -JAVA=$JAVA_HOME/bin/java - -DB_ID="ServiceGatewaydb" -SCRIPT=$APP_ROOT/init/ServiceGateway_tables_@{dbtype}.sql - -JVM_OPT="$JVM_OPT -Dlog.dir=$_APP_LOG_DIR" -JVM_OPT="$JVM_OPT -Dinit.appconfig=$APP_CONF_FILE" -JVM_OPT="$JVM_OPT -Dinit.approot=$APP_ROOT" -JVM_OPT="$JVM_OPT -Dinit.dataSourceId=$DB_ID" -JVM_OPT="$JVM_OPT -Dinit.script=$SCRIPT" -JVM_OPT="$JVM_OPT -Dinit.connectType=$1" -JVM_OPT="$JVM_OPT -Dinit.class=org.openo.baseservice.biz.init.impl.DBInitializer" - -CLASS_PATH="$APP_ROOT/lib/*:$APP_ROOT/webapps/ROOT/WEB-INF/lib/*:" -JVM_OPT="$JVM_OPT -classpath $CLASS_PATH" - -$JAVA $JVM_OPT org.openo.baseservice.biz.inittool.InitTool -result=$? -$CUR_PATH/../../../../manager/agent/tools/shscript/syslogutils.sh "$(basename $0)" "$result" "Execute($#):$CUR_PATH/$0 $@";exit $result diff --git a/servicegateway/pom.xml b/servicegateway/pom.xml index 660e55d4..3836dd5c 100644 --- a/servicegateway/pom.xml +++ b/servicegateway/pom.xml @@ -1,3 +1,18 @@ +<!-- + Copyright 2016 Huawei Technologies Co., Ltd. + + 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. +--> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/servicegateway/service/pom.xml b/servicegateway/service/pom.xml index 17372a4c..320e0f32 100644 --- a/servicegateway/service/pom.xml +++ b/servicegateway/service/pom.xml @@ -1,9 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- /* * Copyright (c) 2016, Huawei Technologies Co., Ltd. * * 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. */ --> +<!-- + Copyright 2016 Huawei Technologies Co., Ltd. + + 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. +--> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> diff --git a/servicegateway/service/src/main/resources/spring/service.xml b/servicegateway/service/src/main/resources/spring/service.xml index c91ed1ca..b1be8e93 100644 --- a/servicegateway/service/src/main/resources/spring/service.xml +++ b/servicegateway/service/src/main/resources/spring/service.xml @@ -1,9 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- /* * Copyright (c) 2016, Huawei Technologies Co., Ltd. * * 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. */ --> +<!-- + Copyright 2016 Huawei Technologies Co., Ltd. + + 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. +--> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:ctx="http://www.springframework.org/schema/context" xmlns:context="http://www.springframework.org/schema/context" xmlns:oms="http://www.huawei.com/schema/oms" @@ -50,47 +60,14 @@ <constructor-arg index="0" ref="sessionFactory" /> </bean> - <bean class="org.openo.gso.servicemgr.activator.Activator"></bean> + <bean class="org.openo.gso.gui.servicegateway.activator.Activator"></bean> - <bean id="Activator" class="org.openo.gso.servicemgr.activator.Activator" init-method="start" destroy-method="stop"> + <bean id="Activator" class="org.openo.gso.gui.servicegateway.activator.Activator" init-method="start" destroy-method="stop"> </bean> - <bean id="ServicemgrRoaModuleImpl" class="org.openo.gso.servicemgr.roa.impl.ServicemgrRoaModuleImpl"> + <bean id="ServicGatewayRoaModuleImpl" class="org.openo.gso.gui.servicegateway.roa.impl.ServicGatewayRoaModuleImpl"> <property name="ServiceGateway" ref="ServiceGateway"></property> </bean> - <bean id="ServiceGateway" class="org.openo.gso.servicemgr.service.impl.ServiceGatewayImpl"> - <property name="serviceModelDao" ref="serviceModelDao"></property> - <property name="subServiceDao" ref="subServiceDao"></property> - <property name="servicePackageDao" ref="servicePackageDao"></property> - <property name="catalogProxy" ref="catalogProxy"></property> - <property name="wsoProxy" ref="wsoProxy"></property> - </bean> - - <bean id="ServicePackageModuleImpl" class="org.openo.gso.servicemgr.roa.impl.ServicePackageModuleImpl"> - <property name="packageMgr" ref="packageMgr"></property> - </bean> - - <bean id="packageMgr" class="org.openo.gso.servicemgr.service.impl.PackageManagerImpl"> - <property name="servicePackageDao" ref="servicePackageDao"></property> - <property name="catalogProxy" ref="catalogProxy"></property> - </bean> - - <bean id="serviceModelDao" class="org.openo.gso.servicemgr.dao.impl.ServiceModelDaoImpl"> - <property name="session" ref="session" /> - </bean> - - <bean id="servicePackageDao" class="org.openo.gso.servicemgr.dao.impl.ServicePackageDaoImpl"> - <property name="session" ref="session" /> - </bean> - - <bean id="subServiceDao" class="org.openo.gso.servicemgr.dao.impl.SubServiceDaoImpl"> - <property name="session" ref="session" /> - </bean> - - <bean id="catalogProxy" class="org.openo.gso.servicemgr.restproxy.impl.CatalogProxyImpl"> - </bean> - - <bean id="wsoProxy" class="org.openo.gso.servicemgr.restproxy.impl.WsoProxyImpl"> </bean> </beans>
\ No newline at end of file diff --git a/servicegateway/service/src/main/webapp/WEB-INF/web.xml b/servicegateway/service/src/main/webapp/WEB-INF/web.xml index 6f06aed3..59f35929 100644 --- a/servicegateway/service/src/main/webapp/WEB-INF/web.xml +++ b/servicegateway/service/src/main/webapp/WEB-INF/web.xml @@ -1,9 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- /* * Copyright (c) 2016, Huawei Technologies Co., Ltd. * * 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. */ --> +<!-- + Copyright 2016 Huawei Technologies Co., Ltd. + + 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. +--> <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee |