Remove deprecated AJSC configuration 55/50655/1
authormark.j.leonard <mark.j.leonard@gmail.com>
Wed, 6 Jun 2018 11:17:41 +0000 (12:17 +0100)
committermark.j.leonard <mark.j.leonard@gmail.com>
Wed, 6 Jun 2018 11:17:58 +0000 (12:17 +0100)
Issue-ID: AAI-1206
Change-Id: Iffad6eb946bb8c63cf69bd2193d7518e733ea406
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
24 files changed:
src/main/ajsc/model-loader_v1/model-loader/v1/conf/modelLoaderBeans.groovy [deleted file]
src/main/ajsc/model-loader_v1/model-loader/v1/docs/README.txt [deleted file]
src/main/ajsc/model-loader_v1/model-loader/v1/lib/README.txt [deleted file]
src/main/ajsc/model-loader_v1/model-loader/v1/props/module.props [deleted file]
src/main/ajsc/model-loader_v1/model-loader/v1/routes/modelLoader.route [deleted file]
src/main/assemble/ajsc_module_assembly.xml [deleted file]
src/main/assemble/ajsc_props_assembly.xml [deleted file]
src/main/assemble/ajsc_runtime_assembly.xml [deleted file]
src/main/config/ajsc-jetty.xml [deleted file]
src/main/config/ajsc-override-web.xml [deleted file]
src/main/config/ajscJetty.jks [deleted file]
src/main/config/jul-redirect.properties [deleted file]
src/main/config/keyfile [deleted file]
src/main/config/runner-web.xml [deleted file]
src/main/runtime/context/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.context [deleted file]
src/main/runtime/context/default#0.context [deleted file]
src/main/runtime/deploymentPackage/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.json [deleted file]
src/main/runtime/shiroRole/ajscadmin.json [deleted file]
src/main/runtime/shiroRole/contextadmin#__module.ajsc.namespace.name__.json [deleted file]
src/main/runtime/shiroRole/contextadmin#default.json [deleted file]
src/main/runtime/shiroUser/ajsc.json [deleted file]
src/main/runtime/shiroUserRole/ajsc#ajscadmin.json [deleted file]
src/main/runtime/shiroUserRole/ajsc#contextadmin#__module.ajsc.namespace.name__.json [deleted file]
src/main/runtime/shiroUserRole/ajsc#contextadmin#default.json [deleted file]

diff --git a/src/main/ajsc/model-loader_v1/model-loader/v1/conf/modelLoaderBeans.groovy b/src/main/ajsc/model-loader_v1/model-loader/v1/conf/modelLoaderBeans.groovy
deleted file mode 100644 (file)
index 2fadedd..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/**\r
- * ============LICENSE_START==========================================\r
- * org.onap.aai\r
- * ===================================================================\r
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.\r
- * Copyright © 2017-2018 Amdocs\r
- * ===================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *        http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END============================================\r
- */\r
-\r
-beans{\r
-       xmlns cxf: "http://camel.apache.org/schema/cxf"\r
-       xmlns jaxrs: "http://cxf.apache.org/jaxrs"\r
-       xmlns util: "http://www.springframework.org/schema/util"\r
-       \r
-       modelLoader(org.onap.aai.modelloader.service.ModelLoaderService)\r
-       \r
-       util.list(id: 'modelLoaderServices') {\r
-               ref(bean:'modelLoader')\r
-       }\r
-}\r
diff --git a/src/main/ajsc/model-loader_v1/model-loader/v1/docs/README.txt b/src/main/ajsc/model-loader_v1/model-loader/v1/docs/README.txt
deleted file mode 100644 (file)
index b642878..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/**\r
- * ============LICENSE_START==========================================\r
- * org.onap.aai\r
- * ===================================================================\r
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.\r
- * Copyright © 2017-2018 Amdocs\r
- * ===================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *        http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END============================================\r
- */\r
-\r
-Place any docs here that you want to access within the ajsc upon deployment of your service.\r
diff --git a/src/main/ajsc/model-loader_v1/model-loader/v1/lib/README.txt b/src/main/ajsc/model-loader_v1/model-loader/v1/lib/README.txt
deleted file mode 100644 (file)
index 002a511..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/**\r
- * ============LICENSE_START==========================================\r
- * org.onap.aai\r
- * ===================================================================\r
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.\r
- * Copyright © 2017-2018 Amdocs\r
- * ===================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *        http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END============================================\r
- */\r
-\r
-3rd party JAR's needed by your jars (if any) for a ajsc deployment package go here...\r
diff --git a/src/main/ajsc/model-loader_v1/model-loader/v1/props/module.props b/src/main/ajsc/model-loader_v1/model-loader/v1/props/module.props
deleted file mode 100644 (file)
index acee82b..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-###\r
-#  ============LICENSE_START==========================================\r
-#  org.onap.aai\r
-#  ===================================================================\r
-#  Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.\r
-#  Copyright © 2017-2018 Amdocs\r
-#  ===================================================================\r
-#  Licensed under the Apache License, Version 2.0 (the "License");\r
-#  you may not use this file except in compliance with the License.\r
-#  You may obtain a copy of the License at\r
-#\r
-#         http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-#  Unless required by applicable law or agreed to in writing, software\r
-#  distributed under the License is distributed on an "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-#  See the License for the specific language governing permissions and\r
-#  limitations under the License.\r
-#  ============LICENSE_END============================================\r
-###\r
-\r
-EXAMPLE.PROPERTY=EXAMLE_VALUE\r
diff --git a/src/main/ajsc/model-loader_v1/model-loader/v1/routes/modelLoader.route b/src/main/ajsc/model-loader_v1/model-loader/v1/routes/modelLoader.route
deleted file mode 100644 (file)
index 0d9f5eb..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--\r
-  ============LICENSE_START==========================================\r
-  org.onap.aai\r
-  ===================================================================\r
-  Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.\r
-  Copyright © 2017-2018 Amdocs\r
-  ===================================================================\r
-  Licensed under the Apache License, Version 2.0 (the "License");\r
-  you may not use this file except in compliance with the License.\r
-  You may obtain a copy of the License at\r
-\r
-         http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
-  ============LICENSE_END============================================\r
-  -->\r
-\r
-\r
-<route xmlns="http://camel.apache.org/schema/spring" trace="true">\r
-  <from uri="att-dme2-servlet:///__module_ajsc_namespace_name__/__module_ajsc_namespace_version__/model-service?matchOnUriPrefix=true" />\r
-  <to uri="cxfbean:modelLoaderServices" />\r
-</route>\r
diff --git a/src/main/assemble/ajsc_module_assembly.xml b/src/main/assemble/ajsc_module_assembly.xml
deleted file mode 100644 (file)
index 3237439..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--\r
-  ============LICENSE_START==========================================\r
-  org.onap.aai\r
-  ===================================================================\r
-  Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.\r
-  Copyright © 2017-2018 Amdocs\r
-  ===================================================================\r
-  Licensed under the Apache License, Version 2.0 (the "License");\r
-  you may not use this file except in compliance with the License.\r
-  You may obtain a copy of the License at\r
-\r
-         http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
-  ============LICENSE_END============================================\r
-  -->\r
-\r
-<assembly\r
-       xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">\r
-       <id>${version}</id>\r
-       <includeBaseDirectory>false</includeBaseDirectory>\r
-       <formats>\r
-               <format>zip</format>\r
-       </formats>\r
-       <fileSets>\r
-               <fileSet>\r
-                       <directory>${project.basedir}/target/versioned-ajsc/routes/</directory>\r
-                       <outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/routes/</outputDirectory>\r
-                       <includes>\r
-                               <include>*.route</include>\r
-                       </includes>\r
-\r
-               </fileSet>\r
-\r
-               <fileSet>\r
-                       <directory>${project.basedir}/target/versioned-ajsc/docs/</directory>\r
-                       <outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/docs/</outputDirectory>\r
-                       <includes>\r
-                               <include>*.*</include>\r
-                               <!-- <include>*.vm</include>  -->\r
-                       </includes>\r
-\r
-               </fileSet>\r
-\r
-               <fileSet>\r
-                       <directory>${project.basedir}/target/versioned-ajsc/lib/</directory>\r
-                       <outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/lib/</outputDirectory>\r
-                       <includes>\r
-                               <include>*.jar</include>\r
-                       </includes>\r
-\r
-               </fileSet>\r
-               <fileSet>\r
-                       <directory>${project.basedir}/target/versioned-ajsc/extJars/</directory>\r
-                       <outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/extJars/</outputDirectory>\r
-                       <includes>\r
-                               <include>*.jar</include>\r
-                       </includes>\r
-               </fileSet>\r
-               \r
-               <!-- also try to grab outputs from the "jar" plugin's package phase -->\r
-               <fileSet>\r
-                       <directory>${project.basedir}/target/</directory>\r
-                       <outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/lib/</outputDirectory>\r
-                       <includes>\r
-                               <include>*.jar</include>\r
-                       </includes>\r
-               </fileSet>\r
-\r
-               <fileSet>\r
-                       <directory>${project.basedir}/target/versioned-ajsc/conf/</directory>\r
-                       <outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/conf/</outputDirectory>\r
-                       <includes>\r
-                               <include>*.*</include>\r
-                       </includes>\r
-\r
-               </fileSet>\r
-       </fileSets>\r
-\r
-</assembly>\r
-\r
diff --git a/src/main/assemble/ajsc_props_assembly.xml b/src/main/assemble/ajsc_props_assembly.xml
deleted file mode 100644 (file)
index 04fa935..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--\r
-  ============LICENSE_START==========================================\r
-  org.onap.aai\r
-  ===================================================================\r
-  Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.\r
-  Copyright © 2017-2018 Amdocs\r
-  ===================================================================\r
-  Licensed under the Apache License, Version 2.0 (the "License");\r
-  you may not use this file except in compliance with the License.\r
-  You may obtain a copy of the License at\r
-\r
-         http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
-  ============LICENSE_END============================================\r
-  -->\r
-\r
-<assembly\r
-       xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">\r
-       <id>${version}_properties</id>\r
-       <includeBaseDirectory>false</includeBaseDirectory>\r
-       <formats>\r
-               <format>zip</format>\r
-       </formats>\r
-       <fileSets>\r
-               <fileSet>\r
-                       <directory>${project.basedir}/target/versioned-ajsc/props</directory>\r
-                       <outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/props/</outputDirectory>\r
-                       <includes>\r
-                               <include>*.props</include>\r
-                       </includes>\r
-\r
-               </fileSet>\r
-\r
-       </fileSets>\r
-\r
-</assembly>\r
-\r
diff --git a/src/main/assemble/ajsc_runtime_assembly.xml b/src/main/assemble/ajsc_runtime_assembly.xml
deleted file mode 100644 (file)
index 3aa29a8..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--\r
-  ============LICENSE_START==========================================\r
-  org.onap.aai\r
-  ===================================================================\r
-  Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.\r
-  Copyright © 2017-2018 Amdocs\r
-  ===================================================================\r
-  Licensed under the Apache License, Version 2.0 (the "License");\r
-  you may not use this file except in compliance with the License.\r
-  You may obtain a copy of the License at\r
-\r
-         http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
-  ============LICENSE_END============================================\r
-  -->\r
-\r
-<assembly\r
-       xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">\r
-       <id>runtimeEnvironment</id>\r
-       <includeBaseDirectory>false</includeBaseDirectory>\r
-       <formats>\r
-               <format>zip</format>\r
-       </formats>\r
-       <fileSets>\r
-               <fileSet>\r
-                       <directory>${project.basedir}/target/versioned-runtime/context/</directory>\r
-                       <outputDirectory>runtime/context/</outputDirectory>\r
-                       <includes>\r
-                               <include>*.context</include>\r
-                       </includes>\r
-               </fileSet>\r
-               <fileSet>\r
-                       <directory>${project.basedir}/target/versioned-runtime/serviceProperties/</directory>\r
-                       <outputDirectory>runtime/serviceProperties/</outputDirectory>\r
-                       <includes>\r
-                               <include>*.props</include>\r
-                       </includes>\r
-               </fileSet><fileSet>\r
-                       <directory>${project.basedir}/target/versioned-runtime/shiroRole</directory>\r
-                       <outputDirectory>runtime/shiroRole/</outputDirectory>\r
-                       <includes>\r
-                               <include>*.json</include>\r
-                       </includes>\r
-               </fileSet><fileSet>\r
-                       <directory>${project.basedir}/target/versioned-runtime/shiroUser</directory>\r
-                       <outputDirectory>runtime/shiroUser/</outputDirectory>\r
-                       <includes>\r
-                               <include>*.json</include>\r
-                       </includes>\r
-               </fileSet><fileSet>\r
-                       <directory>${project.basedir}/target/versioned-runtime/shiroUserRole</directory>\r
-                       <outputDirectory>runtime/shiroUserRole</outputDirectory>\r
-                       <includes>\r
-                               <include>*.json</include>\r
-                       </includes>\r
-               </fileSet>\r
-       </fileSets>\r
-</assembly>\r
diff --git a/src/main/config/ajsc-jetty.xml b/src/main/config/ajsc-jetty.xml
deleted file mode 100644 (file)
index dd612fa..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0"  encoding="UTF-8"?>
-<!--
-  ============LICENSE_START==========================================
-  org.onap.aai
-  ===================================================================
-  Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
-  Copyright © 2017-2018 Amdocs
-  ===================================================================
-  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.
-  ============LICENSE_END============================================
-  -->
-
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-<Configure id="ajsc-server" class="org.eclipse.jetty.server.Server">
-       <!-- DO NOT REMOVE!!!! This is setting up the AJSC Context -->
-       <New id="ajscContext" class="org.eclipse.jetty.webapp.WebAppContext">
-               <Set name="contextPath"><SystemProperty name="AJSC_CONTEXT_PATH" /></Set>
-               <Set name="extractWAR">true</Set>
-               <Set name="tempDirectory"><SystemProperty name="AJSC_TEMP_DIR" /></Set>
-               <Set name="war"><SystemProperty name="AJSC_WAR_PATH" /></Set>
-               <Set name="descriptor"><SystemProperty name="AJSC_HOME" />/etc/runner-web.xml</Set>
-               <Set name="overrideDescriptor"><SystemProperty name="AJSC_HOME" />/etc/ajsc-override-web.xml</Set>
-               <Set name="throwUnavailableOnStartupException">true</Set>
-               <Set name="servletHandler">
-                       <New class="org.eclipse.jetty.servlet.ServletHandler">
-                               <Set name="startWithUnavailable">false</Set>
-                       </New>
-               </Set>
-               <Set name="extraClasspath"><SystemProperty name="AJSC_HOME" />/extJars/httpclient-4.5.jar,<SystemProperty name="AJSC_HOME" />/extJars/httpcore-4.4.1.jar,<SystemProperty name="AJSC_HOME" />/extJars/json-20131018.jar</Set>
-       </New>
-       
-       <Set name="handler">
-               <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection">
-                       <Set name="Handlers">
-                               <Array type="org.eclipse.jetty.webapp.WebAppContext">
-                                       <Item>
-                                               <Ref refid="ajscContext" />
-                                       </Item>
-                               </Array>
-                       </Set>
-               </New>
-       </Set>
-       
-       <Call name="addBean">
-               <Arg>
-                       <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
-                               <Set name="contexts">
-                                       <Ref refid="Contexts" />
-                               </Set>
-                               <Call id="extAppHotDeployProvider" name="addAppProvider">
-                                       <Arg>
-                                               <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
-                                                       <Set name="monitoredDirName"><SystemProperty name="AJSC_HOME" />/extApps</Set>
-                                                       <Set name="scanInterval">10</Set>
-                                                       <Set name="extractWars">true</Set>
-                                               </New>
-                                       </Arg>
-                               </Call>
-                       </New>
-               </Arg>
-       </Call>
-       
-       <Call name="addConnector">
-               <Arg>
-                       <New class="org.eclipse.jetty.server.ServerConnector">
-                               <Arg name="server">
-                                       <Ref refid="ajsc-server" />
-                               </Arg>
-                               <Set name="port"><SystemProperty name="AJSC_HTTP_PORT" default="80" /></Set>
-                       </New>
-               </Arg>
-       </Call>
-       
-       <Get name="ThreadPool">
-               <Set name="minThreads"><SystemProperty name="AJSC_JETTY_ThreadCount_MIN" /></Set>
-               <Set name="maxThreads"><SystemProperty name="AJSC_JETTY_ThreadCount_MAX" /></Set>
-               <Set name="idleTimeout"><SystemProperty name="AJSC_JETTY_IDLETIME_MAX" /></Set>
-               <Set name="detailedDump">false</Set>
-       </Get>
-       
-</Configure>
diff --git a/src/main/config/ajsc-override-web.xml b/src/main/config/ajsc-override-web.xml
deleted file mode 100644 (file)
index 9738282..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>\r
-<!--\r
-  ============LICENSE_START==========================================\r
-  org.onap.aai\r
-  ===================================================================\r
-  Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.\r
-  Copyright © 2017-2018 Amdocs\r
-  ===================================================================\r
-  Licensed under the Apache License, Version 2.0 (the "License");\r
-  you may not use this file except in compliance with the License.\r
-  You may obtain a copy of the License at\r
-\r
-         http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
-  ============LICENSE_END============================================\r
-  -->\r
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" \r
-   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"\r
-   metadata-complete="false" version="3.0">\r
-  \r
-       <filter-mapping>\r
-               <filter-name>InterceptorFilter</filter-name>\r
-               <url-pattern>/services/*</url-pattern>\r
-       </filter-mapping> \r
-       <filter-mapping>\r
-               <filter-name>InterceptorFilter</filter-name>\r
-               <url-pattern>/rest/*</url-pattern>\r
-       </filter-mapping>  \r
-\r
-       <filter-mapping>\r
-               <filter-name>springSecurityFilterChain</filter-name>\r
-               <url-pattern>/*</url-pattern>\r
-       </filter-mapping>\r
-               \r
-       <servlet-mapping>\r
-               <servlet-name>ManagementServlet</servlet-name>\r
-               <url-pattern>/mgmt</url-pattern>\r
-       </servlet-mapping>\r
-        \r
-        <servlet-mapping>\r
-                       <servlet-name>RestletServlet</servlet-name>\r
-                       <url-pattern>/rest/*</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>CamelServlet</servlet-name>\r
-               <url-pattern>/services/*</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>jsp</servlet-name>\r
-               <url-pattern>*.jsp</url-pattern>\r
-               <url-pattern>*.jspf</url-pattern>\r
-               <url-pattern>*.jspx</url-pattern>\r
-               <url-pattern>*.xsp</url-pattern>\r
-               <url-pattern>*.JSP</url-pattern>\r
-               <url-pattern>*.JSPF</url-pattern>\r
-               <url-pattern>*.JSPX</url-pattern>\r
-               <url-pattern>*.XSP</url-pattern>\r
-       </servlet-mapping>\r
-       <servlet-mapping>\r
-               <servlet-name>default</servlet-name>\r
-               <url-pattern>/*</url-pattern>\r
-       </servlet-mapping>\r
-</web-app>\r
diff --git a/src/main/config/ajscJetty.jks b/src/main/config/ajscJetty.jks
deleted file mode 100644 (file)
index 48cdbff..0000000
Binary files a/src/main/config/ajscJetty.jks and /dev/null differ
diff --git a/src/main/config/jul-redirect.properties b/src/main/config/jul-redirect.properties
deleted file mode 100644 (file)
index d7406e3..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-###\r
-#  ============LICENSE_START==========================================\r
-#  org.onap.aai\r
-#  ===================================================================\r
-#  Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.\r
-#  Copyright © 2017-2018 Amdocs\r
-#  ===================================================================\r
-#  Licensed under the Apache License, Version 2.0 (the "License");\r
-#  you may not use this file except in compliance with the License.\r
-#  You may obtain a copy of the License at\r
-#\r
-#         http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-#  Unless required by applicable law or agreed to in writing, software\r
-#  distributed under the License is distributed on an "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-#  See the License for the specific language governing permissions and\r
-#  limitations under the License.\r
-#  ============LICENSE_END============================================\r
-###\r
-\r
-#      Bridge JUL->slf4j Logging Configuration File\r
-#\r
-# This file bridges the JUL logging infrastructure into\r
-# SLF4J so JUL logs go to logback implementation provided\r
-# in this project.  SLF4J also captures log4j and has \r
-# other framework options as well providing a common\r
-# logging infrastructure for capturing all logs from different\r
-# libraries using different frameworks in one place.\r
-\r
-#      Global properties\r
-handlers=org.slf4j.bridge.SLF4JBridgeHandler\r
-.level= ALL\r
diff --git a/src/main/config/keyfile b/src/main/config/keyfile
deleted file mode 100644 (file)
index 882e86a..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-ZuIwp0TkyVPDeX1Up-8JtkMWvjsCpoiu1_VKeWrtrvxunvAke8_tiFyHPPyb2nkhepFYj6tXzpfS
-rGz5XF_TH9NbsKaP8u0HV5clz2WriYQRvHS85vjY7hXxkpFuLb7zkLAPqTyIDpj7FiW61NzsRUAq
-TM8jH16jr7mBNnb56w24mNGOwznMPcIZKcjgZU1ekaPDFpWyhQElU7Y0q_94P_Gkk45r66Hj22sU
-OiOaaftmudZlswLw8-8Zaakqf2yW9HjMVfuYCwSodBHCW5rdB3Ctb5W36rnD_AQco3Ky2PgPmqvk
-QkJYuUHpbuDqVHqLOajlKSIGMTIqAIBg51fRaaONtD-Q5xzY8E5wO1YWTLKcP5tsNvUpzM8Wu3NS
-ynpGpUcvlTqWWsGzTbzOyamyKkdNdx97sSqjM25Zh1-ps48h6cddGYWpab7SUvqRCS11QBUyLTry
-2iwTEHMhHRIbo7PO99ALQfuq9gI1zKGfurJdvLBeBaFs5SCF0AiCZ3WcDO8Rv3HpxVZ2_ShbDxb0
-eMoO6SotXu51fj8Y3-WqsfZziQyEsHyqpg5uQ6yUtz01h5YHLEoVuotF1U4agmQR6kEkYk-wNOiZ
-v-8gaA9gtbLoAdKhuKFxQgQLNMf6GzVzZNujbmDzLoZAP_mXAv29aBPaf64Ugzv-Oa5GZdBgD-Xd
-_pahML-ionw99r0TnkpShYmDqMKhMdjaP3m87WIAZkIB-L-VTyKcEsJ4340VSzCOsv3waiM0S89u
-4cMcG5y-PLY8IoipIlLUPTWD3SjcQ9DV1Dt3T5KjdWLsj48D3W4K4e9PB8yxs0gtUjgVUR2_xEir
-G5eDO9Ac1eHFWGDFFP0SgG-TbHJUKlvy9mwLzmU0fC3xPjhqmIr-v0HxF7HN-tmb1LHDorno8tSN
-u7kUGcKSchIiFfvkd066crUb2mH7PnXTaWmAjyVj9VsBExFUYEdpHMAV4sAP9-RxZGDRt46UhrDK
-QZvvNhBVyOEjHPHWI4vl1r1v8HNH1_2jZu5DVJWyHWR56aCo1lhFH9_X6UAHUHbnXViDONZOVXlT
-9-WD0tk2zJGuwrhdZDAnPnAmjfwbwbpnr5Hmex1i1JiD7WVyP1kbfoej2TmdiYbxr9oBYaGQ29JI
-aHod7MQCLtvL1z5XgnDPLZ4y3_9SbqHKYbNa8UgZkTLF5EacGThYVFDLA9cbafHDtR1kMGE3vv4D
-EJ-0pAYTOGmKlVI7DwNyKsY9JTyudrxTqhOxi9jgcJNWiUaNe9yhL8Pyc2YBqUTTYhh_a2d1rvkZ
-0Gh1crviVxqBrIkRKaMRXZ4f1vDLz-3NvG_vwPOo8WRFo5nGmSdTw7CjBaigJ_cYCfDhoP11pEnw
-cndsZNcHs-v05LlxeIIMDD_f5Bvz-il_DLA4eK2HqgLdxh8ziSDl2azk14MJY4amzz6reEXUuKLV
-RsZGf_jbDGKhE2HuDQ5ovoLOi4OqE1oRuqh-dGxitrYouP2SN1l_1tCEMRth86FMV-6AQtZsvdUo
-y9MtQ7e35atjA8nHtgADlDTmJBKQiUHUsOZ77p1qp17HAFMovUkc739opfEYnKUn6Itpw5Ipm_Is
-ra6chJUfMpOFof5rb5OjqFAN27c_-mPo1lQU3ndYlKGh_n5V8ufX6v2Yri8WzOPf6hjVYotkmoMP
-NPAICDCB8W5ddBjsopzLVVEtaXDu9Qj6-zf77hT4iQ7rBd2Ner8iLqN3Kis0dvkNM3_uH8onau1G
-Y_YYw7PPSZyd2S_7Dd6G-IG4ayO6e5DD6oUwwekyiQI_3rTXNa_wldGxqW9u818010ekE4Qdlfcj
-beIn7fAeaOjReZ87hRgWyMs-EgTVHw8RL3yI_O6VvRTVRONRF1Y4C_-IYa8z-bfrwXx3BBd9TTgb
-EnS9wVOyC2OgUN6BhPLGLhxzkJ05nEjizXEc9t5EPYoSRwesajGGrrG_0-qWbuU5hKLPLkyeJLHb
-5HXOTVsrUR59Vov2M3_EswkxcImblox3k3VS2yihZMGyfqLzZIUXgd8ufkevKKU6DxwacGTb
\ No newline at end of file
diff --git a/src/main/config/runner-web.xml b/src/main/config/runner-web.xml
deleted file mode 100644 (file)
index 198e2e9..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>\r
-<!--\r
-  ============LICENSE_START==========================================\r
-  org.onap.aai\r
-  ===================================================================\r
-  Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.\r
-  Copyright © 2017-2018 Amdocs\r
-  ===================================================================\r
-  Licensed under the Apache License, Version 2.0 (the "License");\r
-  you may not use this file except in compliance with the License.\r
-  You may obtain a copy of the License at\r
-\r
-         http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
-  ============LICENSE_END============================================\r
-  -->\r
-\r
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"\r
-       metadata-complete="false" version="3.0">\r
-\r
-       <context-param>\r
-               <param-name>contextConfigLocation</param-name>\r
-               <param-value>/WEB-INF/spring-servlet.xml,\r
-                                       classpath:applicationContext.xml\r
-               </param-value>\r
-       </context-param>\r
-       \r
-       <context-param>\r
-        <param-name>spring.profiles.default</param-name>\r
-        <param-value>nooauth</param-value>\r
-    </context-param>\r
-    \r
-       <listener>\r
-               <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>\r
-       </listener>\r
-       \r
-       <servlet>\r
-               <servlet-name>ManagementServlet</servlet-name>\r
-               <servlet-class>ajsc.ManagementServlet</servlet-class>\r
-       </servlet>\r
-\r
-    \r
-       <filter> \r
-               <filter-name>InterceptorFilter</filter-name>\r
-               <filter-class>ajsc.filters.InterceptorFilter</filter-class>\r
-               <init-param>\r
-                <param-name>preProcessor_interceptor_config_file</param-name>\r
-                <param-value>/etc/PreProcessorInterceptors.properties</param-value>\r
-        </init-param>\r
-        <init-param>\r
-                <param-name>postProcessor_interceptor_config_file</param-name>\r
-                <param-value>/etc/PostProcessorInterceptors.properties</param-value>\r
-        </init-param>\r
-        \r
-       </filter>\r
-\r
-        <servlet>\r
-               <servlet-name>RestletServlet</servlet-name>\r
-               <servlet-class>ajsc.restlet.RestletSpringServlet</servlet-class>\r
-               <init-param>\r
-                               <param-name>org.restlet.component</param-name>\r
-                               <param-value>restletComponent</param-value>\r
-               </init-param>\r
-       </servlet>\r
-       \r
-       <servlet>\r
-               <servlet-name>CamelServlet</servlet-name>\r
-               <servlet-class>ajsc.servlet.AjscCamelServlet</servlet-class>\r
-       </servlet>\r
-\r
-\r
-       <filter>\r
-               <filter-name>springSecurityFilterChain</filter-name>\r
-               <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>\r
-       </filter>\r
-\r
-       <servlet>\r
-               <servlet-name>spring</servlet-name>\r
-               <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>\r
-               <load-on-startup>1</load-on-startup>\r
-       </servlet>      \r
-       \r
-<!--   <servlet-mapping>\r
-               <servlet-name>spring</servlet-name>\r
-               <url-pattern>/</url-pattern>\r
-       </servlet-mapping>-->\r
-\r
-<!-- BEGIN jsp -->\r
-\r
-  <servlet id="jsp">\r
-    <servlet-name>jsp</servlet-name>\r
-    <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>\r
-  </servlet>\r
-\r
-       \r
-       \r
-\r
-         \r
-       <!-- BEGIN static content -->\r
-       <servlet>\r
-          <servlet-name>default</servlet-name>\r
-           <servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class>\r
-           <init-param>\r
-               <param-name>dirAllowed</param-name>\r
-               <param-value>true</param-value>\r
-           </init-param>\r
-       </servlet>\r
-       <!-- END static content -->     \r
-</web-app>\r
diff --git a/src/main/runtime/context/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.context b/src/main/runtime/context/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.context
deleted file mode 100644 (file)
index 8514196..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"context":{"contextClass":"ajsc.Context","contextId":"__module_ajsc_namespace_name__:__module_ajsc_namespace_version__","contextName":"__module_ajsc_namespace_name__","contextVersion":"__module_ajsc_namespace_version__","description":"__module_ajsc_namespace_name__ Context"}}
\ No newline at end of file
diff --git a/src/main/runtime/context/default#0.context b/src/main/runtime/context/default#0.context
deleted file mode 100644 (file)
index d1b5ab4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"context":{"contextClass":"ajsc.Context","contextId":"default:0","contextName":"default","contextVersion":"0","description":"Default Context"}}
\ No newline at end of file
diff --git a/src/main/runtime/deploymentPackage/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.json b/src/main/runtime/deploymentPackage/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.json
deleted file mode 100644 (file)
index d0954cf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"deploymentPackage":{"Class":"ajsc.DeploymentPackage","Id":"__module.ajsc.namespace.name__:__module_ajsc_namespace_version__","namespace":"__module_ajsc_namespace_name__","namespaceVersion":"__module_ajsc_namespace_version__","description":"__module_ajsc_namespace_name__ __module_ajsc_namespace_version__ - default description","userId":"ajsc"}}
\ No newline at end of file
diff --git a/src/main/runtime/shiroRole/ajscadmin.json b/src/main/runtime/shiroRole/ajscadmin.json
deleted file mode 100644 (file)
index f5e981e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroRoleClass":"ajsc.auth.ShiroRole","shiroRoleId":"ajscadmin","name":"ajscadmin","permissions":"[ajscadmin:*, ajsc:*]"}
\ No newline at end of file
diff --git a/src/main/runtime/shiroRole/contextadmin#__module.ajsc.namespace.name__.json b/src/main/runtime/shiroRole/contextadmin#__module.ajsc.namespace.name__.json
deleted file mode 100644 (file)
index 2dae9f5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroRoleClass":"ajsc.auth.ShiroRole","shiroRoleId":"contextadmin:__module_ajsc_namespace_name__","name":"contextadmin:__module_ajsc_namespace_name__","permissions":"[]"}
\ No newline at end of file
diff --git a/src/main/runtime/shiroRole/contextadmin#default.json b/src/main/runtime/shiroRole/contextadmin#default.json
deleted file mode 100644 (file)
index 5de814e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroRoleClass":"ajsc.auth.ShiroRole","shiroRoleId":"contextadmin:default","name":"contextadmin:default","permissions":"[]"}
\ No newline at end of file
diff --git a/src/main/runtime/shiroUser/ajsc.json b/src/main/runtime/shiroUser/ajsc.json
deleted file mode 100644 (file)
index f4c7855..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroUserClass":"ajsc.auth.ShiroUser","shiroUserId":"ajsc","passwordHash":"9471697417008c880720ba54c6038791ad7e98f3b88136fe34f4d31a462dd27a","permissions":"[*:*]","username":"ajsc"}
\ No newline at end of file
diff --git a/src/main/runtime/shiroUserRole/ajsc#ajscadmin.json b/src/main/runtime/shiroUserRole/ajsc#ajscadmin.json
deleted file mode 100644 (file)
index cb8d483..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroUserRoleClass":"ajsc.auth.ShiroUserRole","shiroUserRoleId":"ajsc:ajscadmin","roleId":"ajscadmin","userId":"ajsc"}
\ No newline at end of file
diff --git a/src/main/runtime/shiroUserRole/ajsc#contextadmin#__module.ajsc.namespace.name__.json b/src/main/runtime/shiroUserRole/ajsc#contextadmin#__module.ajsc.namespace.name__.json
deleted file mode 100644 (file)
index 95d2361..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroUserRoleClass":"ajsc.auth.ShiroUserRole","shiroUserRoleId":"ajsc:contextadmin:__module_ajsc_namespace_name__","roleId":"contextadmin:__module_ajsc_namespace_name__","userId":"ajsc"}
\ No newline at end of file
diff --git a/src/main/runtime/shiroUserRole/ajsc#contextadmin#default.json b/src/main/runtime/shiroUserRole/ajsc#contextadmin#default.json
deleted file mode 100644 (file)
index 2bd5063..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroUserRoleClass":"ajsc.auth.ShiroUserRole","shiroUserRoleId":"ajsc:contextadmin:default","roleId":"contextadmin:default","userId":"ajsc"}
\ No newline at end of file