From c5162f01bb54eab6b3c4056074e28e0080dc4d08 Mon Sep 17 00:00:00 2001
From: yuyang <Gabriel.yuyang@huawei.com>
Date: Mon, 20 Feb 2017 11:28:17 +0800
Subject: Add liscense to file headers

JIRA: BOTTLENECK-133

Some Yaml, XML and __init__.py file do not have liscense headers.
This patch is to add headers to those files or delete those are deprecated.

Change-Id: Ie059b1f1879eb420eec171f96985247510c74642
Signed-off-by: yuyang <Gabriel.yuyang@huawei.com>
---
 .../modules/rubbos_tomcat/files/server.xml         |  38 ----
 .../rubbos_tomcat/files/tomcat_sl/Config.java      |  35 ----
 .../rubbos_tomcat/files/tomcat_sl/build.xml        |  82 ---------
 .../modules/rubbos_tomcat/files/tomcat_sl/web.xml  | 199 ---------------------
 4 files changed, 354 deletions(-)
 delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/server.xml
 delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/Config.java
 delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/build.xml
 delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/web.xml

(limited to 'testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat')

diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/server.xml b/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/server.xml
deleted file mode 100644
index 43ef7c07..00000000
--- a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/server.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<Server port="8005" shutdown="SHUTDOWN">
-  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
-
-  <GlobalNamingResources>
-    <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
-    <Resource name="UserDatabase" auth="Container"
-              type="org.apache.catalina.UserDatabase"
-       description="User database that can be updated and saved"
-           factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-          pathname="conf/tomcat-users.xml" />
-  </GlobalNamingResources>
-
-  <!-- Define the Tomcat Stand-Alone Service -->
-  <Service name="Catalina">
-    <!-- Define a non-SSL HTTP/1.1 Connector on port 2117 (default 8080) -->
-    <Connector port="8080" maxHttpHeaderSize="8192"
-               maxThreads="330" minSpareThreads="5" maxSpareThreads="50"
-               enableLookups="false" redirectPort="8443" acceptCount="6000"
-               connectionTimeout="20000" disableUploadTimeout="true" />
-
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector port="8009"
-               maxThreads="330" minSpareThreads="5" maxSpareThreads="50"
-               acceptCount="6000" redirectPort="8443" protocol="AJP/1.3" />
-
-    <!-- Define the top level container in our container hierarchy -->
-    <Engine name="Catalina" defaultHost="localhost">
-      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-             resourceName="UserDatabase"/>
-      <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true">
-        <Valve className="org.apache.catalina.valves.AccessLogValve"
-                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
-                 pattern="common" resolveHosts="false"/>
-      </Host>
-    </Engine>
-  </Service>
-
-</Server>
diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/Config.java b/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/Config.java
deleted file mode 100644
index dc3fb32f..00000000
--- a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/Config.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package edu.rice.rubbos.servlets;
-
-
-public class Config
-{
-
-  /**
-   * Creates a new <code>Config</code> instance.
-   */
-  Config()
-  {
-  }
-
-
-  public static final String HTMLFilesPath                 = "REPLACED_RUBBOS_HOME/Servlet_HTML";
-  public static final String DatabaseProperties            = "REPLACED_RUBBOS_HOME/Servlets/mysql.properties";
-  public static final int DatabasePropertiesSize = 1;
-
-  public static final int    AboutMePoolSize               = 10;
-  public static final int    BrowseCategoriesPoolSize      = 6;
-  public static final int    BrowseRegionsPoolSize         = 6;
-  public static final int    BuyNowPoolSize                = 4;
-  public static final int    PutBidPoolSize                = 8;
-  public static final int    PutCommentPoolSize            = 2;
-  public static final int    RegisterItemPoolSize          = 2;
-  public static final int    RegisterUserPoolSize          = 2;
-  public static final int    SearchItemsByCategoryPoolSize = 15;
-  public static final int    SearchItemsByRegionPoolSize   = 20;
-  public static final int    StoreBidPoolSize              = 8;
-  public static final int    StoreBuyNowPoolSize           = 4;
-  public static final int    StoreCommentPoolSize          = 2;
-  public static final int    ViewBidHistoryPoolSize        = 4;
-  public static final int    ViewItemPoolSize              = 20;
-  public static final int    ViewUserInfoPoolSize          = 4;
-}
diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/build.xml b/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/build.xml
deleted file mode 100644
index a248847e..00000000
--- a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/build.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<project name="RUBBoS Servlets" default="dist" basedir=".">
-  <property file="../build.properties" />
-  <property name="servlets.html" value="../Servlet_HTML" />
-  
-  <target name="init">
-    <tstamp/>
-    <mkdir dir="${classes.dir}"/>
-  </target>
-  
-  <path id="base.classpath">
-    <pathelement location="${classes.dir}" />
-    <fileset dir="${j2ee}/lib">
-      <include name="j2ee.jar"/>
-    </fileset>
-  </path>
-  
-  <target name="compile" depends="init">
-    <javac srcdir="${src}"
-           includes="edu/rice/rubbos/servlets/*"
-           destdir="${classes.dir}"
-           classpath="${build.classpath}"
-           depend="yes">
-    <classpath refid="base.classpath" />
-    </javac>
-  </target>
-  
-  <target name="jar" depends="init, compile">
-     <jar destfile="${dist}/rubbos_servlets.jar">
-        <fileset dir="${classes.dir}"
-                 includes="edu/rice/rubbos/servlets/*.class"/>
-    </jar>
-  </target>
-
-  <target name="war" depends="init, compile, jar">
-    <copy file="${dist}/rubbos_servlets.jar" todir="${servlets.html}/WEB-INF/lib"/>
-    <copy file="${j2ee}/lib/j2ee.jar" todir="${servlets.html}/WEB-INF/lib"/>
-    <copy file="${mysql_connector}" todir="${servlets.html}/WEB-INF/lib"/>
-  
-    <war destfile="${dist}/rubbos.war" webxml="${servlets.html}/WEB-INF/web.xml" basedir="${web.dir}">
-        <fileset dir="${classes.dir}"
-                 includes="*" excludes="*/web.xml"/>
-	<classes dir="${classes.dir}"/>
-    </war>
-  </target>
-  
-  <target name="dist" depends="init, compile, jar, war">
-  </target>
-
-  <target name="doc">
-     <mkdir dir="docs/api"/>
-     <javadoc classpathref="base.classpath"
-           packagenames="edu.rice.rubbos.*.*"
-           sourcepath="."
-           defaultexcludes="yes"
-           destdir="docs/api"
-           author="true"
-           version="true"
-           use="true"
-           windowtitle="RUBBoS API">
-       <doctitle><![CDATA[<h1>RUBBoS API</h1>]]></doctitle>
-       <bottom><![CDATA[<i>Copyright &#169; 2004 - ObjectWeb Consortium - All Rights Reserved.</i>]]></bottom>
-     </javadoc>
-  </target>
-  
-  <target name="clean">
-    <delete dir="${classes.dir}"/>
-    <delete>
-      <fileset dir="${dist}" includes="rubbos_servlets.jar"/>
-    </delete>
-    <delete>
-      <fileset dir="${dist}" includes="rubbos.war"/>
-    </delete>
-    <delete>
-      <fileset dir="edu" includes="**/*.class"/>
-    </delete>
-  </target>
-  
-  <target name="clean-doc">
-    <delete dir="docs/api"/>
-  </target>
-
-</project>
diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/web.xml b/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/web.xml
deleted file mode 100644
index a937286a..00000000
--- a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/web.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN' 'http://java.sun.com/dtd/web-app_2_3.dtd'>
--->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
-
-<web-app>
-
-    <display-name>RUBBos</display-name>
-    <description>Rice University Bulletin Board System</description>
-
-    <servlet>
-      <servlet-name>BrowseCategories</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.BrowseCategories</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>BrowseStoriesByCategory</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.BrowseStoriesByCategory</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>ViewComment</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.ViewComment</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>ModerateComment</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.ModerateComment</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>PostComment</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.PostComment</servlet-class>
-    </servlet>
-
-   <servlet>
-      <servlet-name>StoreComment</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.StoreComment</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>SubmitStory</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.SubmitStory</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>AcceptStory</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.AcceptStory</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>RejectStory</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.RejectStory</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>ReviewStories</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.ReviewStories</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>StoreStory</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.StoreStory</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>ViewStory</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.ViewStory</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>StoriesOfTheDay</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.StoriesOfTheDay</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>Search</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.Search</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>StoreModeratorLog</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.StoreModeratorLog</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>RegisterUser</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.RegisterUser</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>Author</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.Author</servlet-class>
-    </servlet>
-
-    <servlet>
-      <servlet-name>OlderStories</servlet-name>
-      <servlet-class>edu.rice.rubbos.servlets.OlderStories</servlet-class>
-    </servlet>
-
-
-    <servlet-mapping>
-      <servlet-name>BrowseCategories</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.BrowseCategories</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>BrowseStoriesByCategory</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.BrowseStoriesByCategory</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>ViewComment</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.ViewComment</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>ModerateComment</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.ModerateComment</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>PostComment</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.PostComment</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>StoreComment</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.StoreComment</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>SubmitStory</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.SubmitStory</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>AcceptStory</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.AcceptStory</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>RejectStory</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.RejectStory</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>ReviewStories</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.ReviewStories</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>StoreStory</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.StoreStory</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>ViewStory</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.ViewStory</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>StoriesOfTheDay</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.StoriesOfTheDay</url-pattern>
-    </servlet-mapping>
-
-
-    <servlet-mapping>
-      <servlet-name>Search</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.Search</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-      <servlet-name>StoreModeratorLog</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.StoreModeratorLog</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-       <servlet-name>RegisterUser</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.RegisterUser</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-       <servlet-name>Author</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.Author</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-       <servlet-name>OlderStories</servlet-name>
-      <url-pattern>/servlet/edu.rice.rubbos.servlets.OlderStories</url-pattern>
-    </servlet-mapping>
-
-    <session-config>
-      <session-timeout>30</session-timeout>    <!-- 30 minutes -->
-    </session-config>
-
-</web-app>
-- 
cgit 1.2.3-korg