Updated Copyright and added classes from Issue193

kabutz · Jan 9, 2013 · af90a4e · af90a4e
1 parent 759f4c5
commit af90a4e
Show file tree

Hide file tree

Showing 96 changed files with 4,075 additions and 3,295 deletions.
diff --git a/javaspecialists.iml b/javaspecialists.iml
@@ -6,10 +6,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/target/generated-test-sources/test-annotations" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
       <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
       <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
@@ -18,6 +16,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.9" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" name="Maven: high-scale-lib:high-scale-lib:1.1.2" level="project" />
+    <orderEntry type="library" name="Maven: jsr166e:jsr166e:0.1" level="project" />
   </component>
 </module>
 
diff --git a/javaspecialists.ipr b/javaspecialists.ipr
@@ -5,6 +5,10 @@
   </component>
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
+    <excludeFromCompile>
+      <directory url="file://$PROJECT_DIR$/target/generated-sources/annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/target/generated-test-sources/test-annotations" includeSubdirectories="true" />
+    </excludeFromCompile>
     <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="?*.properties" />
@@ -22,7 +26,7 @@
   </component>
   <component name="CopyrightManager" default="Apache2 - JavaSpecialists">
     <copyright>
-      <option name="notice" value="Copyright (C) 2000-2012 Heinz Max Kabutz&#10;&#10;See the NOTICE file distributed with this work for additional &#10;information regarding copyright ownership.  Heinz Max Kabutz licenses&#10;this file to you under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License. You may&#10;obtain a copy of the License at&#10;&#10;http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+      <option name="notice" value="Copyright (C) 2000-2013 Heinz Max Kabutz&#10;&#10;See the NOTICE file distributed with this work for additional &#10;information regarding copyright ownership.  Heinz Max Kabutz licenses&#10;this file to you under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License. You may&#10;obtain a copy of the License at&#10;&#10;http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
       <option name="keyword" value="Copyright" />
       <option name="allowReplaceKeyword" value="" />
       <option name="myName" value="Apache2 - JavaSpecialists" />
@@ -37,6 +41,7 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
+  <component name="IdProvider" IDEtalkID="717960C24EB8A32629F1B9F6C1A053FB" />
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_STRING" value="-target 1.7" />
   </component>
@@ -201,9 +206,6 @@
         <XML>
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
         </XML>
-        <ADDITIONAL_INDENT_OPTIONS fileType="haml">
-          <option name="INDENT_SIZE" value="2" />
-        </ADDITIONAL_INDENT_OPTIONS>
         <codeStyleSettings language="Groovy">
           <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
           <option name="WRAP_COMMENTS" value="true" />
@@ -246,6 +248,20 @@
     <mapping directory="" vcs="Git" />
   </component>
   <component name="libraryTable">
+    <library name="Maven: high-scale-lib:high-scale-lib:1.1.2">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/lib/high-scale-lib.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="Maven: jsr166e:jsr166e:0.1">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/lib/jsr166e.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
     <library name="Maven: junit:junit:4.9">
       <CLASSES>
         <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.9/junit-4.9.jar!/" />