Added support for additional formats for system types, S3 as a Servic…

…e, and started to get wrmldoc working a bit more
wrml · Oct 16, 2015 · dbc0fae · dbc0fae
1 parent 33ef0c9
commit dbc0fae
Show file tree

Hide file tree

Showing 86 changed files with 10,200 additions and 18,944 deletions.
diff --git a/cli/cli.iml b/cli/cli.iml
@@ -41,22 +41,21 @@
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
     <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.6" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.3" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" />
     <orderEntry type="library" name="Maven: uk.com.robust-it:cloning:1.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.objenesis:objenesis:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.12" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:3.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:3.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:3.2.2.RELEASE" level="project" />
     <orderEntry type="module" module-name="mongo" />
     <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.11.1" level="project" />
+    <orderEntry type="module" module-name="s3" />
+    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-s3:1.10.26" level="project" />
+    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-kms:1.10.26" level="project" />
+    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-core:1.10.26" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.8.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.9.5" level="project" />

diff --git a/cli/pom.xml b/cli/pom.xml
@@ -142,6 +142,10 @@
             <groupId>org.wrml.contrib.runtime.service</groupId>
             <artifactId>mongo</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wrml.contrib.runtime.service</groupId>
+            <artifactId>s3</artifactId>
+        </dependency>
         <!-- 'test'-scoped dependencies -->
         <dependency>
             <groupId>junit</groupId>

diff --git a/cli/src/main/resources/logback.xml b/cli/src/main/resources/logback.xml
@@ -35,7 +35,6 @@
     <logger name="org.apache.cxf" level="WARN"/>
     <logger name="org.apache.http" level="WARN"/>
     <logger name="org.eclipse.jetty" level="WARN"/>
-    <logger name="org.springframework" level="WARN"/>
 
     <root level="DEBUG">
         <appender-ref ref="WRML_LOG"/>

diff --git a/cli/src/test/resources/logback-test.xml b/cli/src/test/resources/logback-test.xml
@@ -30,7 +30,6 @@
     <logger name="org.apache.http" level="WARN"/>
     <logger name="org.eclipse.jetty" level="WARN"/>
     <logger name="org.reflections" level="WARN"/>
-    <logger name="org.springframework" level="WARN"/>
 
     <!-- logback-test.xml should typically be DEBUG.  logback.xml should typically be INFO or WARN. -->
     <root level="DEBUG">

diff --git a/contrib/.gitignore b/contrib/.gitignore
@@ -1,4 +1,7 @@
+target
+logs
 bin
-.project
+.DS_Store
 .classpath
-.settings
+.project
+.settings
diff --git a/contrib/maven/.gitignore b/contrib/maven/.gitignore
diff --git a/contrib/maven/maven.iml b/contrib/maven/maven.iml
diff --git a/contrib/maven/pom.xml b/contrib/maven/pom.xml
diff --git a/contrib/maven/schema-builder-plugin/example-models/.gitignore b/contrib/maven/schema-builder-plugin/example-models/.gitignore
diff --git a/contrib/maven/schema-builder-plugin/example-models/pom.xml b/contrib/maven/schema-builder-plugin/example-models/pom.xml
diff --git a/...maven/schema-builder-plugin/example-models/src/main/json-schema/org/wrml/test/Person.json b/...maven/schema-builder-plugin/example-models/src/main/json-schema/org/wrml/test/Person.json
diff --git a/...maven/schema-builder-plugin/example-models/src/main/wrml-model/org/wrml/test/Alphabet.mdl b/...maven/schema-builder-plugin/example-models/src/main/wrml-model/org/wrml/test/Alphabet.mdl
diff --git a/...en/schema-builder-plugin/example-models/src/main/wrml-model/org/wrml/test/WrmlLetters.mdl b/...en/schema-builder-plugin/example-models/src/main/wrml-model/org/wrml/test/WrmlLetters.mdl