Permalink
Browse files

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

…e, and started to get wrmldoc working a bit more
  • Loading branch information...
1 parent 33ef0c9 commit dbc0fae26cac108131c0678726567484f20bb4c6 @markmasse markmasse committed Oct 16, 2015
Showing with 10,200 additions and 18,944 deletions.
  1. +8 −9 cli/cli.iml
  2. +4 −0 cli/pom.xml
  3. +0 −1 cli/src/main/resources/logback.xml
  4. +0 −1 cli/src/test/resources/logback-test.xml
  5. +5 −2 contrib/.gitignore
  6. +0 −1 contrib/maven/.gitignore
  7. +0 −15 contrib/maven/maven.iml
  8. +0 −53 contrib/maven/pom.xml
  9. +0 −7 contrib/maven/schema-builder-plugin/.gitignore
  10. +0 −57 contrib/maven/schema-builder-plugin/example-models/pom.xml
  11. +0 −19 contrib/maven/schema-builder-plugin/example-models/src/main/json-schema/org/wrml/test/Person.json
  12. +0 −33 contrib/maven/schema-builder-plugin/example-models/src/main/wrml-model/org/wrml/test/Alphabet.mdl
  13. +0 −11 contrib/maven/schema-builder-plugin/example-models/src/main/wrml-model/org/wrml/test/WrmlLetters.mdl
  14. +0 −237 ...rib/maven/schema-builder-plugin/src/main/java/org/wrml/mojo/schema/builder/SchemaBuilderMojo.java
  15. +0 −31 contrib/maven/schema-builder-plugin/src/main/resources/org/wrml/mojo/schema/builder/wrml.json
  16. +0 −1 contrib/pom.xml
  17. +2 −9 contrib/runtime/service/mongo/mongo.iml
  18. +1 −1 contrib/runtime/service/mongo/src/main/java/org/wrml/contrib/runtime/service/mongo/MongoService.java
  19. +1 −0 contrib/runtime/service/pom.xml
  20. 0 contrib/{maven/schema-builder-plugin/example-models → runtime/service/s3}/.gitignore
  21. +114 −31 contrib/{maven/schema-builder-plugin → runtime/service/s3}/pom.xml
  22. +14 −17 contrib/{maven/schema-builder-plugin/schema-builder-plugin.iml → runtime/service/s3/s3.iml}
  23. +356 −0 contrib/runtime/service/s3/src/main/java/org/wrml/contrib/runtime/service/s3/S3Service.java
  24. +2 −10 core/core.iml
  25. +0 −9 core/pom.xml
  26. +13 −3 core/src/main/java/org/wrml/runtime/format/DefaultFormatLoader.java
  27. +15 −3 core/src/main/java/org/wrml/runtime/format/SystemFormat.java
  28. +635 −0 core/src/main/java/org/wrml/runtime/format/application/vnd/wrml/complete/api/CompleteApiBuilder.java
  29. +88 −0 ...src/main/java/org/wrml/runtime/format/application/vnd/wrml/complete/api/CompleteApiFormatter.java
  30. +136 −190 .../vnd/wrml/{design/schema/SchemaDesignFormatter.java → complete/schema/CompleteSchemaBuilder.java}
  31. +108 −0 ...in/java/org/wrml/runtime/format/application/vnd/wrml/complete/schema/CompleteSchemaFormatter.java
  32. +530 −0 core/src/main/java/org/wrml/runtime/format/application/vnd/wrml/swagger/api/SwaggerApiBuilder.java
  33. +3 −497 core/src/main/java/org/wrml/runtime/format/application/vnd/wrml/swagger/api/SwaggerApiFormatter.java
  34. +181 −0 core/src/main/java/org/wrml/runtime/format/application/vnd/wrml/wrmldoc/WrmldocDataBuilder.java
  35. +94 −0 core/src/main/java/org/wrml/runtime/format/application/vnd/wrml/wrmldoc/WrmldocDataFormatter.java
  36. +49 −690 core/src/main/java/org/wrml/runtime/format/text/html/WrmldocFormatter.java
  37. +1 −0 core/src/main/java/org/wrml/runtime/schema/DefaultSchemaLoader.java
  38. +0 −2 core/src/main/resources/org/wrml/runtime/format/text/html/index.html
  39. +4 −4 ...rml/runtime/format/application/vnd/wrml/{design → complete}/schema/SchemaDesignFormatterTest.java
  40. +0 −1 core/src/test/resources/logback-test.xml
  41. +0 −7 integration/.gitignore
  42. +0 −156 integration/pom.xml
  43. +0 −20 integration/src/main/java/org/wrml/integration/IntegrationTest.java
  44. +0 −31 integration/src/main/java/org/wrml/integration/IntegrationTestRunner.java
  45. +0 −32 integration/src/main/java/org/wrml/integration/config/IntegrationConfig.java
  46. +0 −40 integration/src/main/java/org/wrml/integration/context/ContextStore.java
  47. +0 −9 integration/src/main/resources/META-INF/applicationContext.xml
  48. +0 −14 integration/src/main/resources/META-INF/config.properties
  49. +0 −21 integration/src/main/resources/META-INF/wrml.json
  50. +0 −9 integration/src/main/webapp/WEB-INF/applicationContext.xml
  51. +0 −22 integration/src/main/webapp/WEB-INF/spring/wrmlServlet/servlet-context.xml
  52. +0 −33 integration/src/main/webapp/WEB-INF/web.xml
  53. +0 −38 integration/src/test/java/org/wrml/integration/TestTest.java
  54. +0 −103 integration/src/test/java/org/wrml/integration/WrmlIntegrationTest.java
  55. +0 −40 integration/src/test/java/org/wrml/integration/WrmlRestIntegrationTest.java
  56. +0 −37 integration/src/test/resources/logback-test.xml
  57. +8 −70 pom.xml
  58. +0 −5 server/server-core/pom.xml
  59. +2 −10 server/server-core/server-core.iml
  60. +12 −11 server/server-core/src/main/java/org/wrml/server/WrmlServlet.java
  61. +0 −760 server/server-core/src/test/java/org/wrml/server/WrmlServletTest.java
  62. +0 −20 server/server-core/src/test/resources/org/wrml/server/wrml.json
  63. +0 −20 server/server-core/src/test/resources/org/wrml/server/wrmlbad.json
  64. +4 −0 server/server-war/pom.xml
  65. +8 −9 server/server-war/server-war.iml
  66. +0 −1 server/server-war/src/main/resources/logback.xml
  67. +9 −2 server/server-war/src/main/resources/wrml.json
  68. +1 −0 wrml-server-docker-build/.gitignore
  69. +4 −0 wrml-server-docker-build/Dockerfile
  70. +2 −1 wrmldoc/.gitignore
  71. +2 −26 wrmldoc/build.sh
  72. +3,198 −3,534 wrmldoc/css/wrmldoc.css
  73. +24 −6,522 wrmldoc/css/wrmldoc.min.css
  74. +12 −7 wrmldoc/css/wrmldoc.scss
  75. +567 −891 wrmldoc/css/wrmldoc.tmp.css
  76. +34 −22 wrmldoc/js/app/Wrmldoc.coffee
  77. +3 −5 wrmldoc/js/app/apps/documentNotFound/DocumentNotFoundApp.coffee
  78. +18 −0 wrmldoc/js/app/apps/documentNotFound/show/DocumentNotFoundShowView.coffee
  79. +1 −1 wrmldoc/js/app/apps/documentNotFound/show/templates/documentNotFound_show.eco
  80. +6 −4 wrmldoc/js/app/apps/model/ModelApp.coffee
  81. +1 −1 wrmldoc/js/app/apps/model/show/ModelShowController.coffee
  82. +3 −3 wrmldoc/js/app/apps/model/show/templates/model_show.eco
  83. +4 −4 wrmldoc/js/app/apps/schema/show/templates/schema_show.eco
  84. +1 −1 wrmldoc/js/lib.min.js
  85. +3,736 −4,277 wrmldoc/js/wrmldoc.js
  86. +176 −180 wrmldoc/js/wrmldoc.min.js
View
@@ -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" />
View
@@ -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>
@@ -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"/>
@@ -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">
View
@@ -1,4 +1,7 @@
+target
+logs
bin
-.project
+.DS_Store
.classpath
-.settings
+.project
+.settings
@@ -1 +0,0 @@
-target
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <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" />
- </component>
-</module>
View
@@ -1,53 +0,0 @@
-<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>org.wrml</groupId>
- <artifactId>contrib</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <organization>
- <name>Mark Masse (OSS project WRML.org)</name>
- <url>http://www.wrml.org</url>
- </organization>
- <groupId>org.wrml.contrib</groupId>
- <packaging>pom</packaging>
- <name>maven</name>
- <description>Contributions that may optionally be used along with the WRML core.</description>
-
- <dependencies>
-
- <!-- Testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <modules>
- <module>./schema-builder-plugin</module>
- </modules>
-
- <build>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
- <artifactId>maven</artifactId>
-</project>
@@ -1,7 +0,0 @@
-target
-bin
-logs
-.classpath
-.project
-.settings
-dependency-reduced-pom.xml
@@ -1,57 +0,0 @@
-<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>
- <groupId>org.wrml.contrib.examples</groupId>
- <artifactId>example-models</artifactId>
- <version>1.0-SNAPSHOT</version>
- <build>
- <plugins>
- <plugin>
- <groupId>org.wrml</groupId>
- <artifactId>schema-builder-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <goals>
- <goal>model</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.wrml</groupId>
- <artifactId>
- schema-builder-plugin
- </artifactId>
- <versionRange>
- [1.0-SNAPSHOT,)
- </versionRange>
- <goals>
- <goal>model</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
@@ -1,19 +0,0 @@
-{
- "title": "Person Schema",
- "type": "object",
- "properties": {
- "firstName": {
- "type": "string"
- },
- "lastName": {
- "type": "string"
- },
- "age": {
- "description": "Age in years",
- "type": "integer",
- "minimum": 0,
- "maximum": 150
- }
- },
- "required": ["firstName", "lastName"]
-}
@@ -1,33 +0,0 @@
-{
- "uniqueName" : "org/wrml/test/Alphabet",
- "list" :
- [
- "alf",
- "buckarooBanzai",
- "capricaSix",
- "darkwingDuck",
- "et",
- "flashGordon",
- "gandalf",
- "heMan",
- "I",
- "J",
- "k",
- "l",
- "m",
- "n",
- "o",
- "p",
- "q",
- "r",
- "s",
- "T",
- "u",
- "V",
- "W",
- "x",
- "y",
- "zippy"
- ],
- "version" : 1
-}
@@ -1,11 +0,0 @@
-{
- "uniqueName" : "org/wrml/test/WrmlLetters",
- "list" :
- [
- "W",
- "R",
- "M",
- "L"
- ],
- "version" : 1
-}
Oops, something went wrong.

0 comments on commit dbc0fae

Please sign in to comment.