You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@sdap.apache.org by GitBox <gi...@apache.org> on 2018/02/07 18:01:47 UTC

[GitHub] lewismc closed pull request #3: SDAP-3 Provide functionality to generate UML Diagrams for MUDROD data structures

lewismc closed pull request #3: SDAP-3 Provide functionality to generate UML Diagrams for MUDROD data structures
URL: https://github.com/apache/incubator-sdap-mudrod/pull/3
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/.gitignore b/.gitignore
index 5f137c9..6b975b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,11 @@
 .project
 .settings/
 **/*.settings/org.eclipse.wst.validation.prefs
+service/.settings/org.eclipse.wst.common.component
+web/.settings/org.eclipse.wst.common.component
+service/.settings/org.eclipse.wst.common.component
+core/bin/
+service/bin/
+core/lib
+service/lib
+core/mudrod.log*
diff --git a/core/src/main/java/org/apache/sdap/mudrod/recommendation/pre/MetadataTFIDFGenerator.java b/core/src/main/java/org/apache/sdap/mudrod/recommendation/pre/MetadataTFIDFGenerator.java
index 5204b80..eb22630 100644
--- a/core/src/main/java/org/apache/sdap/mudrod/recommendation/pre/MetadataTFIDFGenerator.java
+++ b/core/src/main/java/org/apache/sdap/mudrod/recommendation/pre/MetadataTFIDFGenerator.java
@@ -1,11 +1,16 @@
-/**
- * Project Name:mudrod-core
- * File Name:TFIDFGenerator.java
- * Package Name:org.apache.sdap.mudrod.recommendation.pre
- * Date:Aug 22, 201612:39:52 PM
- * Copyright (c) 2016, chenzhou1025@126.com All Rights Reserved.
+/*
+ * 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.
  */
-
 package org.apache.sdap.mudrod.recommendation.pre;
 
 import org.apache.sdap.mudrod.discoveryengine.DiscoveryStepAbstract;
diff --git a/core/src/main/java/org/apache/sdap/mudrod/recommendation/pre/SessionCooccurence.java b/core/src/main/java/org/apache/sdap/mudrod/recommendation/pre/SessionCooccurence.java
index 514b044..63cb33e 100644
--- a/core/src/main/java/org/apache/sdap/mudrod/recommendation/pre/SessionCooccurence.java
+++ b/core/src/main/java/org/apache/sdap/mudrod/recommendation/pre/SessionCooccurence.java
@@ -1,11 +1,16 @@
-/**
- * Project Name:mudrod-core
- * File Name:SessionCooccurenceMatrix.java
- * Package Name:org.apache.sdap.mudrod.recommendation.pre
- * Date:Aug 19, 20163:06:33 PM
- * Copyright (c) 2016, chenzhou1025@126.com All Rights Reserved.
+/*
+ * 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.
  */
-
 package org.apache.sdap.mudrod.recommendation.pre;
 
 import org.apache.sdap.mudrod.discoveryengine.DiscoveryStepAbstract;
diff --git a/core/src/main/java/org/apache/sdap/mudrod/recommendation/process/AbstractBasedSimilarity.java b/core/src/main/java/org/apache/sdap/mudrod/recommendation/process/AbstractBasedSimilarity.java
index a3a2c9e..7a288a4 100644
--- a/core/src/main/java/org/apache/sdap/mudrod/recommendation/process/AbstractBasedSimilarity.java
+++ b/core/src/main/java/org/apache/sdap/mudrod/recommendation/process/AbstractBasedSimilarity.java
@@ -1,11 +1,16 @@
-/**
- * Project Name:mudrod-core
- * File Name:TopicBasedCF.java
- * Package Name:org.apache.sdap.mudrod.recommendation.process
- * Date:Aug 22, 201610:45:55 AM
- * Copyright (c) 2016, chenzhou1025@126.com All Rights Reserved.
+/*
+ * 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.
  */
-
 package org.apache.sdap.mudrod.recommendation.process;
 
 import org.apache.sdap.mudrod.discoveryengine.DiscoveryStepAbstract;
diff --git a/core/src/main/java/org/apache/sdap/mudrod/recommendation/process/sessionBasedCF.java b/core/src/main/java/org/apache/sdap/mudrod/recommendation/process/sessionBasedCF.java
index a9e0699..d953d3d 100644
--- a/core/src/main/java/org/apache/sdap/mudrod/recommendation/process/sessionBasedCF.java
+++ b/core/src/main/java/org/apache/sdap/mudrod/recommendation/process/sessionBasedCF.java
@@ -1,11 +1,16 @@
-/**
- * Project Name:mudrod-core
- * File Name:sessionBasedCF.java
- * Package Name:org.apache.sdap.mudrod.recommendation.process
- * Date:Aug 19, 20163:17:00 PM
- * Copyright (c) 2016, chenzhou1025@126.com All Rights Reserved.
+/*
+ * 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.
  */
-
 package org.apache.sdap.mudrod.recommendation.process;
 
 import org.apache.sdap.mudrod.discoveryengine.DiscoveryStepAbstract;
diff --git a/core/src/main/java/org/apache/sdap/mudrod/ssearch/Searcher.java b/core/src/main/java/org/apache/sdap/mudrod/ssearch/Searcher.java
index 34b9fa4..0438267 100644
--- a/core/src/main/java/org/apache/sdap/mudrod/ssearch/Searcher.java
+++ b/core/src/main/java/org/apache/sdap/mudrod/ssearch/Searcher.java
@@ -106,6 +106,7 @@ public Double exists(ArrayList<String> strList, String query) {
    * @param type           type name in Elasticsearch
    * @param query          regular query string
    * @param queryOperator query mode- query, or, and
+   * @param rankOption a keyword used to dertermine the ElasticSearch SortOrder 
    * @return a list of search result
    */
   @SuppressWarnings("unchecked")
@@ -248,6 +249,7 @@ public Double exists(ArrayList<String> strList, String query) {
    * @param type           type name in Elasticsearch
    * @param query          regular query string
    * @param queryOperator query mode- query, or, and
+   * @param rankOption a keyword used to dertermine the ElasticSearch SortOrder 
    * @param rr             selected ranking method
    * @return search results
    */
diff --git a/pom.xml b/pom.xml
index 249519a..5ab85a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,20 +36,14 @@
         </license>
     </licenses>
 
-    <organization>
-        <name>George Mason University</name>
-        <url>https://www2.gmu.edu/</url>
-    </organization>
-
     <developers>
         <developer>
             <id>lewismc</id>
             <name>Lewis John McGibbney</name>
-            <email>lewis[dot]j[dot]mcgibbney[at]jpl[dot]nasa[dot]gov</email>
+            <email>lewismc[at]apache[dot]org</email>
             <roles>
                 <role>Committer</role>
             </roles>
-            <organization>NASA Jet Propulsion Laboratory</organization>
         </developer>
         <developer>
             <id>Yongyao</id>
@@ -267,6 +261,25 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- Generate UML diagrams in javadoc using doclet: mvn javadoc:aggregate -->
+            <!-- Graphiviz installation is required, see http://plantuml.com/graphviz-dot -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.0.0</version>
+                <configuration>
+                    <doclet>info.leadinglight.umljavadoclet.UmlJavaDoclet</doclet>
+                    <docletArtifact>
+                        <groupId>com.chfourie</groupId>
+                        <artifactId>uml-java-doclet</artifactId>
+                        <version>1.0.0</version>
+                    </docletArtifact>
+                    <!-- -linetype polyline / spline / ortho (default) -->
+                    <!-- -dependencies public (default) / protected / package / private -->
+                    <additionalparam></additionalparam>
+                    <useStandardDocletOptions>true</useStandardDocletOptions>
+                </configuration>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
diff --git a/service/.settings/.jsdtscope b/service/.settings/.jsdtscope
deleted file mode 100644
index 2418123..0000000
--- a/service/.settings/.jsdtscope
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="src/main/webapp"/>
-	<classpathentry kind="src" path="target/m2e-wtp/web-resources"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
-	<classpathentry kind="output" path=""/>
-</classpath>
diff --git a/service/.settings/org.eclipse.core.resources.prefs b/service/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index abdea9a..0000000
--- a/service/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/service/.settings/org.eclipse.jdt.core.prefs b/service/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6e80039..0000000
--- a/service/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/service/.settings/org.eclipse.m2e.core.prefs b/service/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/service/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/service/.settings/org.eclipse.wst.common.component b/service/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 8255907..0000000
--- a/service/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="mudrod-service-0.0.1-SNAPSHOT">
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="mudrod-core-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/mudrod-core/mudrod-core">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="mudrod-web-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/mudrod-web/mudrod-web">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <property name="context-root" value="mudrod-service"/>
-        <property name="java-output-path" value="/mudrod-service/target/classes"/>
-    </wb-module>
-</project-modules>
diff --git a/service/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/service/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
deleted file mode 100644
index cc81385..0000000
--- a/service/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<root>
-  <facet id="jst.jaxrs">
-    <node name="libprov">
-      <attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
-    </node>
-  </facet>
-</root>
diff --git a/service/.settings/org.eclipse.wst.common.project.facet.core.xml b/service/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index fac1799..0000000
--- a/service/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="1.8"/>
-  <installed facet="jst.web" version="3.0"/>
-  <installed facet="jst.jaxrs" version="2.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-</faceted-project>
diff --git a/service/.settings/org.eclipse.wst.jsdt.ui.superType.container b/service/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a..0000000
--- a/service/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/service/.settings/org.eclipse.wst.jsdt.ui.superType.name b/service/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b..0000000
--- a/service/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/service/.settings/org.eclipse.wst.validation.prefs b/service/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8c..0000000
--- a/service/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/service/lib/all-1.1.2.pom b/service/lib/all-1.1.2.pom
deleted file mode 100644
index 577dd32..0000000
--- a/service/lib/all-1.1.2.pom
+++ /dev/null
@@ -1,102 +0,0 @@
-<?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>
-
-    <parent>
-        <groupId>com.github.fommil.netlib</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.1</version>
-    </parent>
-
-    <artifactId>all</artifactId>
-    <packaging>pom</packaging>
-    <version>1.1.2</version>
-
-    <dependencies>
-        <dependency>
-            <!-- WORKAROUND: https://github.com/sbt/sbt/issues/861 -->
-            <groupId>net.sourceforge.f2j</groupId>
-            <artifactId>arpack_combined_all</artifactId>
-            <version>0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>core</artifactId>
-            <version>1.1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>netlib-native_ref-osx-x86_64</artifactId>
-            <version>${project.parent.version}</version>
-            <classifier>natives</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>netlib-native_ref-linux-x86_64</artifactId>
-            <version>${project.parent.version}</version>
-            <classifier>natives</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>netlib-native_ref-linux-i686</artifactId>
-            <version>${project.parent.version}</version>
-            <classifier>natives</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>netlib-native_ref-win-x86_64</artifactId>
-            <version>${project.parent.version}</version>
-            <classifier>natives</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>netlib-native_ref-win-i686</artifactId>
-            <version>${project.parent.version}</version>
-            <classifier>natives</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>netlib-native_ref-linux-armhf</artifactId>
-            <version>${project.parent.version}</version>
-            <classifier>natives</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>netlib-native_system-osx-x86_64</artifactId>
-            <version>${project.parent.version}</version>
-            <classifier>natives</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>netlib-native_system-linux-x86_64</artifactId>
-            <version>${project.parent.version}</version>
-            <classifier>natives</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>netlib-native_system-linux-i686</artifactId>
-            <version>${project.parent.version}</version>
-            <classifier>natives</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>netlib-native_system-linux-armhf</artifactId>
-            <version>${project.parent.version}</version>
-            <classifier>natives</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>netlib-native_system-win-x86_64</artifactId>
-            <version>${project.parent.version}</version>
-            <classifier>natives</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>netlib-native_system-win-i686</artifactId>
-            <version>${project.parent.version}</version>
-            <classifier>natives</classifier>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/service/lib/apache-jena-libs-3.1.0.pom b/service/lib/apache-jena-libs-3.1.0.pom
deleted file mode 100644
index 3fdb874..0000000
--- a/service/lib/apache-jena-libs-3.1.0.pom
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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. -->
-
-<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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>apache-jena-libs</artifactId>
-  <packaging>pom</packaging>
-  <name>Apache Jena - Libraries POM</name>
-  <version>3.1.0</version>
-
-  <parent>
-    <groupId>org.apache.jena</groupId>
-    <artifactId>jena-parent</artifactId>
-    <version>16</version>
-    <relativePath>../jena-parent</relativePath>
-  </parent>
-
-  <!-- Need if the parent is a snapshot -->
-  <repositories>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshot Repository</name>
-      <url>http://repository.apache.org/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-
-  <description>A convenience POM artifact that may be referenced to pull in all the standard Jena Libraries (Core, ARQ, IRI, and TDB) with a single dependency.</description>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-tdb</artifactId>
-      <version>3.1.0</version>
-    </dependency>
-
-  </dependencies>
-
-</project>
diff --git a/service/src/main/assembly/LICENSE-server-embedded.txt b/service/src/main/assembly/LICENSE-server-embedded.txt
index 8c1c026..d4eed67 100644
--- a/service/src/main/assembly/LICENSE-server-embedded.txt
+++ b/service/src/main/assembly/LICENSE-server-embedded.txt
@@ -203,7 +203,7 @@
 
 MUDROD DEPENDENCIES:
 
-The Murdor distribution packages include a number of dependencies with
+The Muddod distribution packages include a number of dependencies with
 separate copyright notices and license terms. Your use of the binaries for these
 dependencies is subject to the terms and conditions of the following licenses.
 
diff --git a/service/src/main/assembly/NOTICE-with-deps.txt b/service/src/main/assembly/NOTICE-with-deps.txt
index 6e464c1..e00d042 100644
--- a/service/src/main/assembly/NOTICE-with-deps.txt
+++ b/service/src/main/assembly/NOTICE-with-deps.txt
@@ -1,6 +1,4 @@
 Mudrod
-Copyright 2011-2012 The Apache Software Foundation
-Copyright 2008-2011 Digital Enterprise Research Institute (DERI)
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/web/.gitignore b/web/.gitignore
index b83d222..0f63015 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -1 +1,2 @@
 /target/
+/bin/
diff --git a/web/.settings/org.eclipse.jdt.core.prefs b/web/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 45a6e0e..0000000
--- a/web/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/web/.settings/org.eclipse.m2e.core.prefs b/web/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/web/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/web/.settings/org.eclipse.wst.common.component b/web/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 0da6e11..0000000
--- a/web/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="mudrod-web">
-        <wb-resource deploy-path="/" source-path="/META-INF"/>
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-    </wb-module>
-</project-modules>
diff --git a/web/.settings/org.eclipse.wst.common.project.facet.core.xml b/web/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index a1f6907..0000000
--- a/web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="java" version="1.5"/>
-  <installed facet="jst.utility" version="1.0"/>
-</faceted-project>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services