Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

CLEREZZA-720: Clerezza platform now on wink, triaxrs discontinued

git-svn-id: https://svn.apache.org/repos/asf/incubator/clerezza/trunk@1414670 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit d2e3c42eff5d8b27281bbfd22b6232c3e1acfa5b 1 parent 9f6a4d0
@retog retog authored
Showing with 551 additions and 28,564 deletions.
  1. +0 −201 jaxrs.testutils/LICENSE
  2. +0 −65 jaxrs.testutils/pom.xml
  3. +0 −12 jaxrs.testutils/src/main/appended-resources/META-INF/NOTICE
  4. +0 −85 jaxrs.testutils/src/main/java/org/apache/clerezza/jaxrs/testutils/PortFinder.java
  5. +0 −130 jaxrs.testutils/src/main/java/org/apache/clerezza/jaxrs/testutils/TestWebServer.java
  6. +0 −78 jaxrs.testutils/src/test/java/org/apache/clerezza/jaxrs/testutils/TestTestWebServer.java
  7. +3 −0  jaxrs.utils/pom.xml
  8. +1 −2  jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/MultiPartFormMBRTest.java
  9. +0 −10 maven-pladoc-plugin/maven-pladoc-plugin.core/pom.xml
  10. +2 −2 maven-pladoc-plugin/maven-pladoc-plugin.service/pom.xml
  11. +4 −3 ...aven-pladoc-plugin.service/src/main/java/org/apache/clerezza/pladocplugin/service/GeneratorServiceImpl.java
  12. +5 −45 parent/pom.xml
  13. +0 −4 platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml
  14. +1 −1  ...untcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/MenuItemProvider.scala
  15. +4 −5 ...ccountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/SettingsPanel.scala
  16. +6 −7 platform.concepts/platform.concepts.core/pom.xml
  17. +3 −0  ...form.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManagerTest.java
  18. +2 −6 platform.content/pom.xml
  19. +6 −7 platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java
  20. +3 −0  platform.content/src/main/java/org/apache/clerezza/platform/content/Editor.java
  21. +3 −4 platform.content/src/main/java/org/apache/clerezza/platform/content/WebDavUtils.java
  22. +0 −4 platform.dashboard.webinterface/pom.xml
  23. +5 −4 platform.dashboard/platform.dashboard.core/pom.xml
  24. +1 −2  ...m.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java
  25. +0 −15 platform.dashboard/platform.dashboard.tests/pom.xml
  26. +28 −12 ...orm.graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/GraphNodeProvider.scala
  27. +12 −2 platform.launcher.storageless.parent/platform.launcher.storageless/pom.xml
  28. +36 −21 platform.launcher.storageless.parent/pom.xml
  29. +4 −3 platform.mail/pom.xml
  30. +1 −1  platform.mail/src/main/java/org/apache/clerezza/platform/mail/MailManPermission.java
  31. +1 −1  platform.mail/src/test/java/org/apache/clerezza/platform/mail/MailManPermissionTest.java
  32. +0 −201 platform.security.auth.basic/LICENSE
  33. +0 −53 platform.security.auth.basic/pom.xml
  34. +0 −141 ...security.auth.basic/src/main/java/org/apache/clerezza/platform/security/auth/basic/BasicAuthentication.java
  35. +0 −201 platform.security.auth.cookie/LICENSE
  36. +0 −71 platform.security.auth.cookie/pom.xml
  37. +0 −221 ...urity.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieAuthentication.java
  38. +0 −252 platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogin.java
  39. +0 −130 ...form.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogout.java
  40. +0 −42 ...m.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/onotology/LOGIN.java
  41. +0 −32 platform.security.auth.cookie/src/main/resources/CLEREZZA-INF/web-resources/login-resources/scripts/login.js
  42. +0 −115 platform.security.auth.cookie/src/main/resources/CLEREZZA-INF/web-resources/login-resources/style/login.css
  43. +0 −63 platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/login.ssp
  44. +0 −42 ...m.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/login_naked.ssp
  45. +0 −79 ...ecurity.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/ontology/login.rdf
  46. +0 −201 platform.security/LICENSE
  47. +0 −116 platform.security/pom.xml
  48. +0 −212 platform.security/src/main/java/org/apache/clerezza/platform/security/BundlePermissionManager.java
  49. +0 −72 platform.security/src/main/java/org/apache/clerezza/platform/security/PasswordUtil.java
  50. +0 −107 platform.security/src/main/java/org/apache/clerezza/platform/security/PermissionDefinitions.java
  51. +0 −76 platform.security/src/main/java/org/apache/clerezza/platform/security/SecurityActivator.java
  52. +0 −273 platform.security/src/main/java/org/apache/clerezza/platform/security/UserAwarePolicy.java
  53. +0 −67 platform.security/src/main/java/org/apache/clerezza/platform/security/UserPermissionsCache.java
  54. +0 −32 platform.security/src/main/java/org/apache/clerezza/platform/security/UserUnregisteredException.java
  55. +0 −115 platform.security/src/main/java/org/apache/clerezza/platform/security/UserUtil.java
  56. +0 −41 platform.security/src/main/java/org/apache/clerezza/platform/security/WebIdBasedPermissionProvider.java
  57. +0 −159 platform.security/src/main/java/org/apache/clerezza/platform/security/auth/AuthenticatingFilter.java
  58. +0 −45 platform.security/src/main/java/org/apache/clerezza/platform/security/auth/AuthenticationChecker.java
  59. +0 −114 platform.security/src/main/java/org/apache/clerezza/platform/security/auth/AuthenticationCheckerImpl.java
  60. +0 −61 platform.security/src/main/java/org/apache/clerezza/platform/security/auth/AuthenticationMethod.java
  61. +0 −109 platform.security/src/main/java/org/apache/clerezza/platform/security/auth/AuthenticationService.java
  62. +0 −70 platform.security/src/main/java/org/apache/clerezza/platform/security/auth/CheckAuthenticationPermission.java
  63. +0 −40 platform.security/src/main/java/org/apache/clerezza/platform/security/auth/LoginException.java
  64. +0 −35 platform.security/src/main/java/org/apache/clerezza/platform/security/auth/LoginListener.java
  65. +0 −23 platform.security/src/main/java/org/apache/clerezza/platform/security/auth/NoSuchAgent.java
  66. +0 −52 platform.security/src/main/java/org/apache/clerezza/platform/security/auth/PrincipalImpl.java
  67. +0 −34 platform.security/src/main/java/org/apache/clerezza/platform/security/auth/WeightedAuthenticationMethod.java
  68. +0 −79 platform.security/src/main/java/org/apache/clerezza/platform/security/permissioncheck/PermissionCheck.java
  69. +0 −69 platform.security/src/main/resources/META-INF/documentation.nt
  70. +0 −88 platform.security/src/test/java/org/apache/clerezza/platform/security/PermissionDefinitionsTest.java
  71. +0 −12 platform.security/src/test/resources/org/apache/clerezza/platform/security/systemgraph.nt
  72. +1 −13 platform.testing/pom.xml
  73. +21 −0 platform.typehandlerspace/pom.xml
  74. +99 −46 platform.typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpace.java
  75. +269 −264 ...form.typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpaceTest.java
  76. +0 −5 platform.typepriority/pom.xml
  77. +0 −5 platform.typerendering/platform.typerendering.core/pom.xml
  78. +2 −2 ...anager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java
  79. +2 −2 platform.usermanager/pom.xml
  80. +0 −59 platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginListener.java
  81. +3 −3 platform.users/core/pom.xml
  82. +2 −1  platform.users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
  83. +1 −0  platform.xhtml2html/pom.xml
  84. +1 −6 pom.xml
  85. +3 −3 rdf.core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
  86. +0 −4 rdf.core/src/site/resources/documentation/scb-triaxrs-tutorial/pom.xml
  87. +5 −6 rdf.simple.storage/src/main/java/org/apache/clerezza/rdf/simple/storage/SimpleTcProvider.java
  88. +4 −3 sshshell/pom.xml
  89. +7 −10 sshshell/src/main/java/org/apache/clerezza/sshshell/SshShell.java
  90. +0 −201 triaxrs/LICENSE
  91. +0 −57 triaxrs/pom.xml
  92. +0 −201 triaxrs/triaxrs.tests/LICENSE
  93. +0 −147 triaxrs/triaxrs.tests/pom.xml
  94. +0 −111 .../triaxrs.tests/src/test/java/org/apache/clerezza/triaxrs/blackbox/osgi/AbstractServiceRootResourceTest.java
  95. +0 −70 ...xrs/triaxrs.tests/src/test/java/org/apache/clerezza/triaxrs/blackbox/osgi/FelixServiceRootResourceTest.java
  96. +0 −39 triaxrs/triaxrs.tests/src/test/java/org/apache/clerezza/triaxrs/blackbox/osgi/SimpleRootResource.java
  97. +0 −201 triaxrs/triaxrs/LICENSE
  98. +0 −216 triaxrs/triaxrs/pom.xml
  99. +0 −41 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/Activator.java
  100. +0 −42 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/Constants.java
  101. +0 −376 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/InjectionUtilities.java
  102. +0 −612 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/JaxRsHandler.java
  103. +0 −90 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/MethodDescriptor.java
  104. +0 −23 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/NoMatchingRootResourceException.java
  105. +0 −108 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/ProcessableResponse.java
  106. +0 −580 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/ResponseProcessor.java
  107. +0 −138 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/RootResourceDescriptor.java
  108. +0 −596 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/RootResourceExecutorImpl.java
  109. +0 −155 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/RootResources.java
  110. +0 −72 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/WebRequest.java
  111. +0 −265 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/WebRequestImpl.java
  112. +0 −59 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/WebRequestProxy.java
  113. +0 −171 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/delegate/ResponseBuilderImpl.java
  114. +0 −61 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/delegate/ResponseImpl.java
  115. +0 −105 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/delegate/RuntimeDelegateImpl.java
  116. +0 −183 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/headerDelegate/CacheControlHeaderDelegate.java
  117. +0 −167 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/headerDelegate/CookieHeaderDelegate.java
  118. +0 −53 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/headerDelegate/DateHeaderDelegate.java
  119. +0 −109 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/headerDelegate/EntityTagHeaderDelegate.java
  120. +0 −128 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/headerDelegate/LocaleProvider.java
  121. +0 −108 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/headerDelegate/MediaTypeHeaderDelegate.java
  122. +0 −142 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/headerDelegate/NewCookieHeaderDelegate.java
  123. +0 −40 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/headerDelegate/StringProvider.java
  124. +0 −47 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/headerDelegate/URIProvider.java
  125. +0 −75 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/parameterinjectors/ContextInjector.java
  126. +0 −173 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/parameterinjectors/ConversionUtil.java
  127. +0 −71 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/parameterinjectors/CookieParameterInjector.java
  128. +0 −72 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/parameterinjectors/FormParameterInjector.java
  129. +0 −70 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/parameterinjectors/HeaderParameterInjector.java
  130. +0 −61 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/parameterinjectors/MatrixParameterInjector.java
  131. +0 −40 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/parameterinjectors/ParameterInjector.java
  132. +0 −79 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/parameterinjectors/PathParameterInjector.java
  133. +0 −67 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/parameterinjectors/QueryParameterInjector.java
  134. +0 −31 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/parameterinjectors/UnsupportedFieldType.java
  135. +0 −245 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/prefixmanager/TriaxrsPrefixManager.java
  136. +0 −132 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/AggregatedProviders.java
  137. +0 −83 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/BaseMediaType.java
  138. +0 −78 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/CascadeNode.java
  139. +0 −236 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/CascadingProviders.java
  140. +0 −53 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/DefaultProviders.java
  141. +0 −38 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/ProviderCriteria.java
  142. +0 −280 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/ProvidersImpl.java
  143. +0 −146 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/SelectableProviders.java
  144. +0 −90 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/provided/ByteArrayProvider.java
  145. +0 −149 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/provided/DataSourceProvider.java
  146. +0 −184 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/provided/FileProvider.java
  147. +0 −143 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/provided/FormMultivaluedMapProvider.java
  148. +0 −94 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/provided/InputStreamProvider.java
  149. +0 −71 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/provided/JafMessageBodyReader.java
  150. +0 −114 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/provided/JafMessageBodyWriter.java
  151. +0 −113 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/provided/ReaderProvider.java
  152. +0 −244 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/provided/SourceProvider.java
  153. +0 −64 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/provided/StreamingOutputProvider.java
  154. +0 −83 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/provided/StringMessageBodyReader.java
  155. +0 −78 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/providers/provided/StringMessageBodyWriter.java
  156. +0 −189 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/AcceptCharset.java
  157. +0 −179 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/AcceptHeader.java
  158. +0 −70 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/BodyStoringResponse.java
  159. +0 −40 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/CaseInsensitiveMap.java
  160. +0 −62 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/FirstByteActionOutputStream.java
  161. +0 −80 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/HttpDateParser.java
  162. +0 −135 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/HttpHeadersImpl.java
  163. +0 −60 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/InconsistentMediaTypeComparator.java
  164. +0 −169 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/MediaTypeComparator.java
  165. +0 −240 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/MediaTypeUtils.java
  166. +0 −57 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/MessageBundle.java
  167. +0 −59 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/Messages.java
  168. +0 −63 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/MethodSignature.java
  169. +0 −191 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/MethodUtil.java
  170. +0 −233 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/MultivaluedMapImpl.java
  171. +0 −51 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/PathMatching.java
  172. +0 −69 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/PathSegmentImpl.java
  173. +0 −276 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/ProviderUtils.java
  174. +0 −158 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/QueryStringParser.java
  175. +0 −98 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/RestConstants.java
  176. +0 −51 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/SimpleMap.java
  177. +0 −113 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/SoftConcurrentMap.java
  178. +0 −67 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/StreamDataSource.java
  179. +0 −168 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/StringUtils.java
  180. +0 −81 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/TemplateEncoder.java
  181. +0 −264 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/URITemplate.java
  182. +0 −500 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/UriHelper.java
  183. +0 −160 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/UriInfoImpl.java
  184. +0 −540 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/uri/UriEncoder.java
  185. +0 −160 triaxrs/triaxrs/src/main/java/org/apache/clerezza/triaxrs/util/uri/UriPathNormalizer.java
  186. +0 −1  triaxrs/triaxrs/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate
  187. +0 −233 triaxrs/triaxrs/src/main/resources/org/apache/clerezza/triaxrs/util/resource.properties
  188. BIN  triaxrs/triaxrs/src/site/resources/documentation/images/tut_1_class_diagram.png
  189. +0 −421 triaxrs/triaxrs/src/site/resources/documentation/style/style.css
  190. BIN  triaxrs/triaxrs/src/site/resources/images/clerezza.png
  191. +0 −35 triaxrs/triaxrs/src/site/site.xml
  192. +0 −99 triaxrs/triaxrs/src/site/xsite/content/download.xhtml
  193. +0 −137 triaxrs/triaxrs/src/site/xsite/content/howto_prefix.xhtml
  194. +0 −102 triaxrs/triaxrs/src/site/xsite/content/reference.xhtml
  195. +0 −40 triaxrs/triaxrs/src/site/xsite/content/sitemap.xml
  196. +0 −661 triaxrs/triaxrs/src/site/xsite/content/tutorial_1.xhtml
  197. +0 −71 triaxrs/triaxrs/src/site/xsite/templates/skin.html
  198. +0 −343 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/ComponentsRegistrationTest.java
  199. +0 −68 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/TestGetMethodCalledByPath.java
  200. +0 −79 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/TestProviders.java
  201. +0 −78 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/TestTemplate.java
  202. +0 −197 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/AcceptMethodSelectionTest.java
  203. +0 −170 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/AutoGeneratedOptionsTest.java
  204. +0 −86 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/BodyMatcher.java
  205. +0 −207 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/ContextInjectionIntoFieldTest.java
  206. +0 −340 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/DefaultValueAnnotationTest.java
  207. +0 −98 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/EmptyPathSubResourceLocaterTest.java
  208. +0 −189 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/ExceptionMappingForProvidersTest.java
  209. +0 −117 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/ExtendedMediaTypeTest.java
  210. +0 −96 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/FormParamTest.java
  211. +0 −138 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/MethodSelectionTest.java
  212. +0 −146 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/ResourceExecutorTest.java
  213. +0 −163 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/ResourcePathTest.java
  214. +0 −250 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/SourceProviderTest.java
  215. +0 −49 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/StringValueMatcher.java
  216. +0 −119 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/SubResourceLocatorTest.java
  217. +0 −291 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestAnnotationInheritance.java
  218. +0 −101 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestApplicationProvidedSingleton.java
  219. +0 −107 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestApplicationProvidedWriter.java
  220. +0 −136 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestBundlePathPrefix.java
  221. +0 −264 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestCascadingProviders.java
  222. +0 −85 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestCheckedExceptionHandling.java
  223. +0 −114 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestComponentInjectedWriter.java
  224. +0 −113 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestExceptionMappingProviderSelection.java
  225. +0 −139 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestGenericEntityResponse.java
  226. +0 −158 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestLocaleProvider.java
  227. +0 −86 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestNullEntityResponseBuilder.java
  228. +0 −97 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestPlainPathParam.java
  229. +0 −79 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestPostSubResourceMethod.java
  230. +0 −72 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestPrimitiveCharInjection.java
  231. +0 −72 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestPrimitiveIntInjection.java
  232. +0 −134 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestPutWithReader.java
  233. +0 −133 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestQueryParam.java
  234. +0 −72 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestRegexPathParam.java
  235. +0 −120 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestResponse.java
  236. +0 −84 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestResponseToAcceptHeader.java
  237. +0 −70 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestSimpleGet.java
  238. +0 −98 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestSimplePathParam.java
  239. +0 −93 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestSimplePut.java
  240. +0 −187 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestTriaxrsPrefixManager.java
  241. +0 −74 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestUnavailableGet.java
  242. +0 −76 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestWebApplicationExceptionHandling.java
  243. +0 −97 ...rs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestWebApplicationExceptionHandlingWithoutEntity.java
  244. +0 −112 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestWriterDeterminedContentType.java
  245. +0 −146 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/WildcardWriterTest.java
  246. +0 −82 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/context/TestHeadersInjection.java
  247. +0 −161 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/jaf/TestJafProvider.java
  248. +0 −48 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/jaf/resources/JafSerializableObj.java
  249. +0 −87 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/jaf/resources/JsoDataContentHandler.java
  250. +0 −37 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/jaf/resources/MyDchFactory.java
  251. +0 −35 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/resources/ConversionTst.java
  252. +0 −300 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/writers/SelectWriterBasedOnAcceptTest.java
  253. +0 −177 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/writers/TestRuntimeWriterSelection.java
  254. +0 −222 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/writers/WriterAcceptTest.java
  255. +0 −141 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/mock/RequestImpl.java
  256. +0 −89 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/mock/RequestURIImpl.java
  257. +0 −84 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/mock/ResponseImpl.java
  258. +0 −95 triaxrs/triaxrs/src/test/java/org/apache/clerezza/triaxrs/providers/CascadingProvidersTest.java
Sorry, we could not display the entire diff because it was too big.
View
201 jaxrs.testutils/LICENSE
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
View
65 jaxrs.testutils/pom.xml
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
-<!--
-
- 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.
-
--->
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>clerezza</artifactId>
- <groupId>org.apache.clerezza</groupId>
- <version>0.3-incubating-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>jaxrs.testutils</artifactId>
- <packaging>jar</packaging>
- <version>0.10-incubating-SNAPSHOT</version>
- <name>Clerezza - Test Utilities for Jax-Rs Applications</name>
- <dependencies>
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi-jetty</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
View
12 jaxrs.testutils/src/main/appended-resources/META-INF/NOTICE
@@ -1,12 +0,0 @@
-Portions are
-All rights reserved. For this parts the following disclaimer aplies:
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
View
85 jaxrs.testutils/src/main/java/org/apache/clerezza/jaxrs/testutils/PortFinder.java
@@ -1,85 +0,0 @@
-//original from HP GVS project in com.hp.hpl.jena.gvs.services.http.test
-package org.apache.clerezza.jaxrs.testutils;
-/*
- *
- * 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.
- *
-*/
-
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.util.Random;
-
-public class PortFinder {
-
- final static int startPort = 8100;
- final static int scanPorts = 100;
-
- public static int getFreePort(InetAddress inetAddress) {
-
- ServerSocket serverSocket;
- for (int i = 0; i < scanPorts; i++) {
- try {
- serverSocket = new ServerSocket(startPort+i, 0, inetAddress);
- } catch (IOException e) {
- continue;
- }
- try {
- serverSocket.close();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- return serverSocket.getLocalPort();
- }
- throw new RuntimeException("No free port between " + startPort
- + " and " + (startPort + scanPorts) + " found");
- }
-
-}
-
-/*
- * (c) Copyright 2005, 2006 Hewlett-Packard Development Company, LP All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
View
130 jaxrs.testutils/src/main/java/org/apache/clerezza/jaxrs/testutils/TestWebServer.java
@@ -1,130 +0,0 @@
-/*
- * 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.
- */
-package org.apache.clerezza.jaxrs.testutils;
-
-import java.io.IOException;
-import java.net.BindException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import javax.ws.rs.core.Application;
-
-import org.apache.clerezza.triaxrs.JaxRsHandler;
-import org.wymiwyg.wrhapi.ServerBinding;
-import org.wymiwyg.wrhapi.WebServer;
-import org.wymiwyg.wrhapi.WebServerFactory;
-
-/**
- * Creates a single webserver, the webserver is stopped when
- * the instance is garbage collected
- *
- * @author reto
- */
-public class TestWebServer {
-
- private int port;
- private WebServer webServer;
- private boolean stopped;
-
- /**
- * starts a webserver for the given jax-rs application
- *
- * @param application
- * the application to be exposed
- * @return the port at which the webserver has been started
- */
- public TestWebServer(final Application application) {
- try {
- port = PortFinder.getFreePort(InetAddress.getLocalHost());
- } catch (UnknownHostException ex) {
- throw new RuntimeException(ex);
- }
-
- try {
- // we bind the application in the initializer of a subclass as the
- // method is protected
- JaxRsHandler handler = new JaxRsHandler() {
-
- {
- registerApplicationConfig(application, "");
- }
- };
- while (true) {
-
- ServerBinding serverBinding = new ServerBinding() {
-
- @Override
- public int getPort() {
- return port;
- }
-
- @Override
- public InetAddress getInetAddress() {
- try {
- return InetAddress.getLocalHost();
- } catch (UnknownHostException ex) {
- throw new RuntimeException(ex);
- }
- }
- };
- try {
- webServer = WebServerFactory.newInstance().startNewWebServer(
- handler, serverBinding);
- } catch (BindException e) {
- //the port delivered by PortFinder might have already
- //been taken by someone else
- port++;
- continue;
- }
- break;
- }
- } catch (UnknownHostException ex) {
- throw new RuntimeException(ex);
- } catch (IOException ex) {
- throw new RuntimeException(ex);
- }
- }
-
- /**
- * A TestWebServer gets a free port on start-up
- *
- * @return the port the webserver is listening to
- */
- public int getPort() {
- return port;
- }
-
- protected void finalize() throws Throwable {
- try {
- if (!stopped) {
- webServer.stop();
- }
- } finally {
- super.finalize();
- }
- }
-
- /**
- * stops the webserver
- */
- public void stop() {
- webServer.stop();
- stopped = true;
- }
-}
View
78 jaxrs.testutils/src/test/java/org/apache/clerezza/jaxrs/testutils/TestTestWebServer.java
@@ -1,78 +0,0 @@
-/*
- * 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.
- */
-package org.apache.clerezza.jaxrs.testutils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.HashSet;
-import java.util.Set;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Application;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * This tests the {@link TestWebServer} and also demonstrates how it is
- * intended to be use (instead of MyResource you use the resource(s) to be
- * tested.
- *
- * @author reto
- */
-public class TestTestWebServer {
-
-
- @Path("/")
- public static class MyResource {
-
- @GET
- public byte[] handleGet() {
- byte[] result = {1,2};
- return result;
- }
- }
-
- @Test
- public void testWebServerRuns() throws IOException {
- TestWebServer testWebServer = new TestWebServer(new Application() {
-
- @Override
- public Set<Class<?>> getClasses() {
- Set<Class<?>> result = new HashSet<Class<?>>();
- result.add(MyResource.class);
- return result;
- }
-
- });
- int port = testWebServer.getPort();
- URL serverURL = new URL("http://localhost:"
- + port + "/");
- URLConnection connection = serverURL.openConnection();
- //here we can do things like:
- connection.addRequestProperty("Accept", "application/x-test");
- //now we actually open the connection
- InputStream responseStream = connection.getInputStream();
- Assert.assertEquals(1, responseStream.read());
- Assert.assertEquals(2, responseStream.read());
- testWebServer.stop();
-
- }
-}
View
3  jaxrs.utils/pom.xml
@@ -47,10 +47,13 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
+ <!-- testing with last released version, testutils is doscontinued as
+ triaxrs is -->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.testutils</artifactId>
<scope>test</scope>
+ <version>0.9-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
View
3  jaxrs.utils/src/test/java/org/apache/clerezza/jaxrs/utils/MultiPartFormMBRTest.java
@@ -30,7 +30,6 @@
import org.apache.clerezza.jaxrs.utils.form.FormFile;
import org.apache.clerezza.jaxrs.utils.form.MultiPartBody;
import org.apache.clerezza.jaxrs.utils.form.MultiPartFormMessageBodyReader;
-import org.apache.clerezza.triaxrs.delegate.RuntimeDelegateImpl;
/**
* @author mir
@@ -50,7 +49,7 @@
@Test
public void testMultiPartForm() throws Exception {
- RuntimeDelegate.setInstance(new RuntimeDelegateImpl());
+ //RuntimeDelegate.setInstance(new RuntimeDelegateImpl());
StringBuilder sb = new StringBuilder();
sb.append("--AaB03x\r\n");
sb.append("Content-Disposition: form-data; name=\""+ paramName1 +"\"\r\n");
View
10 maven-pladoc-plugin/maven-pladoc-plugin.core/pom.xml
@@ -102,16 +102,6 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>osgi_R4_compendium</artifactId>
- <groupId>org.osgi</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.parser</artifactId>
<!-- <scope>provided</scope> -->
</dependency>
View
4 maven-pladoc-plugin/maven-pladoc-plugin.service/pom.xml
@@ -51,8 +51,8 @@
<!-- <scope>provided</scope> -->
</dependency>
<dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
View
7 ...n-pladoc-plugin.service/src/main/java/org/apache/clerezza/pladocplugin/service/GeneratorServiceImpl.java
@@ -45,7 +45,7 @@
import org.apache.clerezza.rdf.ontologies.DISCOBITS;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
-import org.wymiwyg.wrhapi.Handler;
+
/**
*
@@ -62,8 +62,9 @@
/**
* this is just to activate Triaxrs in order for MediaType to work
*/
- @Reference
- Handler triaxrs;
+ //TODO find the wink way to ensure this
+ /*@Reference
+ Handler triaxrs;*/
protected void activate(ComponentContext componentContext) {
System.out.println("activating generator service");
View
50 parent/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>10</version>
+ <version>12</version>
</parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>clerezza</artifactId>
@@ -642,16 +642,6 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
- <version>0.12-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>jaxrs.testutils</artifactId>
- <version>0.10-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>platform</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
</dependency>
@@ -830,11 +820,11 @@
<artifactId>rdf.sesame.storage</artifactId>
<version>0.13-incubating-SNAPSHOT</version>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security</artifactId>
<version>0.9-incubating-SNAPSHOT</version>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security.conditions</artifactId>
@@ -842,29 +832,19 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.security.auth.basic</artifactId>
- <version>0.5-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>platform.users.core</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.security.auth.cookie</artifactId>
- <version>0.5-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>platform.typehandlerspace</artifactId>
<version>0.9-incubating-SNAPSHOT</version>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security.foafssl.core</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security.foafssl.test</artifactId>
@@ -887,26 +867,6 @@
</dependency>
<dependency>
<groupId>org.wymiwyg</groupId>
- <artifactId>jetty-osgi-httpservice</artifactId>
- <version>0.1</version>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi</artifactId>
- <version>0.9</version>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi-osgi</artifactId>
- <version>0.4.2</version>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi-jetty</artifactId>
- <version>0.9</version>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
<artifactId>wymiwyg-commons-core</artifactId>
<version>0.7.6</version>
</dependency>
View
4 platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml
@@ -121,10 +121,6 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.seedsnipe</artifactId>
</dependency>
<dependency>
View
2  ...controlpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/MenuItemProvider.scala
@@ -34,7 +34,7 @@ import org.apache.felix.scr.annotations.Component
import org.apache.felix.scr.annotations.Service
import org.apache.clerezza.platform.dashboard.GlobalMenuItem
import org.apache.clerezza.platform.dashboard.GlobalMenuItemsProvider
-import org.apache.clerezza.platform.security.UserUtil
+import org.apache.stanbol.commons.security.UserUtil
/**
*
View
9 ...untcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/SettingsPanel.scala
@@ -90,7 +90,6 @@ import org.apache.clerezza.rdf.ontologies.PLATFORM
import org.apache.clerezza.rdf.ontologies.RDF
import org.apache.clerezza.rdf.utils.GraphNode
import org.apache.clerezza.rdf.utils.UnionMGraph
-import org.apache.clerezza.triaxrs.prefixmanager.TriaxrsPrefixManager
object SettingPanel {
val logger: Logger = LoggerFactory.getLogger(classOf[SettingsPanel])
@@ -296,7 +295,7 @@ class SettingsPanel {
private def addBundlePrefix(bundle: Bundle, prefix: String): Unit = {
var symbolicName: String = bundle.getSymbolicName
- if (configAdmin != null) {
+ /*if (configAdmin != null) {
try {
var configuration: Configuration = configAdmin.getConfiguration(classOf[TriaxrsPrefixManager].getName)
val properties = configuration.getProperties match {
@@ -318,12 +317,12 @@ class SettingsPanel {
}
else {
logger.warn("Cannot add prefix mapping. Configuration Admin is missing")
- }
+ }*/
}
private[accountcontrolpanel] def removeBundlePrefix(bundle: Bundle): Unit = {
var symbolicName: String = bundle.getSymbolicName
- if ((this.configAdmin != null) && (symbolicName != null)) {
+ /*if ((this.configAdmin != null) && (symbolicName != null)) {
try {
val configuration: Configuration = configAdmin.getConfiguration(classOf[TriaxrsPrefixManager].getName)
val properties = configuration.getProperties match {
@@ -344,7 +343,7 @@ class SettingsPanel {
}
else {
logger.warn("Cannot add prefix mapping. Configuration Admin is missing")
- }
+ }*/
}
/**
View
13 platform.concepts/platform.concepts.core/pom.xml
@@ -89,15 +89,14 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>web.fileserver</artifactId>
- <version>0.10-incubating-SNAPSHOT</version>
- <type>bundle</type>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-common</artifactId>
+ <version>1.2.1-incubating</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
View
3  ...m.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManagerTest.java
@@ -21,6 +21,7 @@
import java.util.Arrays;
import java.util.List;
import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.RuntimeDelegate;
import org.apache.clerezza.platform.concepts.ontologies.CONCEPTS;
import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
import org.apache.clerezza.rdf.core.Graph;
@@ -28,6 +29,7 @@
import org.apache.clerezza.rdf.core.access.LockableMGraph;
import org.apache.clerezza.rdf.core.access.LockableMGraphWrapper;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.wink.common.internal.runtime.RuntimeDelegateImpl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -61,6 +63,7 @@ public void fillConceptProviderList() {
@Before
public void setUp() {
+ RuntimeDelegate.setInstance(new RuntimeDelegateImpl());
testedConceptProviderManager = new TestedConceptProviderManager();
testedConceptProviderManager.cgProvider = new ContentGraphProvider() {
View
8 platform.content/pom.xml
@@ -72,10 +72,6 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.graphnodeprovider</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.usermanager</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.seedsnipe</artifactId>
@@ -106,10 +102,10 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.config</artifactId>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security</artifactId>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.scalaserverpages</artifactId>
View
13 platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java
@@ -86,7 +86,6 @@
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.wymiwyg.wrhapi.HeaderName;
/**
* This Class allows getting and putting content structured using the
@@ -98,9 +97,9 @@
* @author reto, tho, agron, mir
*/
@Component(metatype=true)
-@Services({
- @Service(Object.class),
- @Service(DiscobitsHandler.class)
+@Service({
+ Object.class,
+ DiscobitsHandler.class
})
@Property(name="org.apache.clerezza.platform.typehandler", boolValue=true)
@Reference(name="metaDataGenerator",
@@ -468,7 +467,7 @@ public Response options(@Context UriInfo uriInfo) {
return resourceUnavailable(nodeUri, uriInfo);
}
Response.ResponseBuilder builder = Response.ok();
- builder.header(HeaderName.DAV.toString(), "1");
+ builder.header("Dav", "1");
Set<String> allow = new HashSet<String>();
Method[] methods = this.getClass().getMethods();
for (Method method : methods) {
@@ -480,7 +479,7 @@ public Response options(@Context UriInfo uriInfo) {
}
}
if (allow.isEmpty()) {
- builder.header(HeaderName.ALLOW.toString(), "");
+ builder.header("Allow", "");
} else {
final Iterator<String> iterator = allow.iterator();
final StringBuffer buffer = new StringBuffer(iterator.next());
@@ -488,7 +487,7 @@ public Response options(@Context UriInfo uriInfo) {
buffer.append(", ");
buffer.append(iterator.next());
}
- builder.header(HeaderName.ALLOW.toString(), buffer.toString());
+ builder.header("Allow", buffer.toString());
}
return builder.build();
}
View
3  platform.content/src/main/java/org/apache/clerezza/platform/content/Editor.java
@@ -28,6 +28,7 @@
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
@@ -149,6 +150,8 @@ public void postDiscobit(@QueryParam("graph") UriRef graphUri,
}
@GET
+ //this is to work around
+ @Produces(MediaType.APPLICATION_OCTET_STREAM)
public PathNode getStaticFile(@Context UriInfo uriInfo) {
TrailingSlash.enforcePresent(uriInfo);
final PathNode node = getNode("disco.xhtml");
View
7 platform.content/src/main/java/org/apache/clerezza/platform/content/WebDavUtils.java
@@ -56,7 +56,6 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.wymiwyg.wrhapi.HeaderName;
/**
*
@@ -174,7 +173,7 @@ static String getHeaderAsString(HttpHeaders headers, String header) {
*/
static Response options(Class<?> clazz){
Response.ResponseBuilder builder = Response.ok();
- builder.header(HeaderName.DAV.toString(), "1");
+ builder.header("Dav", "1");
Set<String> allow = new HashSet<String>();
Method[] methods = clazz.getMethods();
for (Method method : methods){
@@ -187,7 +186,7 @@ static Response options(Class<?> clazz){
}
}
if (allow.isEmpty()) {
- builder.header(HeaderName.ALLOW.toString(), "");
+ builder.header("Allow", "");
} else {
final Iterator<String> iterator = allow.iterator();
final StringBuffer buffer = new StringBuffer(iterator.next());
@@ -195,7 +194,7 @@ static Response options(Class<?> clazz){
buffer.append(", ");
buffer.append(iterator.next());
}
- builder.header(HeaderName.ALLOW.toString(), buffer.toString());
+ builder.header("Allow", buffer.toString());
}
return builder.build();
}
View
4 platform.dashboard.webinterface/pom.xml
@@ -40,10 +40,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi</artifactId>
- </dependency>
- <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</dependency>
View
9 platform.dashboard/platform.dashboard.core/pom.xml
@@ -41,10 +41,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi</artifactId>
- </dependency>
- <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</dependency>
@@ -80,6 +76,11 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.security</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
<plugins>
View
3  ...ashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java
@@ -18,8 +18,7 @@
*/
package org.apache.clerezza.platform.dashboard;
-import org.apache.clerezza.platform.security.UserUtil;
-import org.apache.clerezza.platform.security.WebIdBasedPermissionProvider;
+import org.apache.stanbol.commons.security.UserUtil;
import org.apache.clerezza.platform.typerendering.UserContextProvider;
import org.apache.clerezza.platform.usermanager.UserManager;
import org.apache.clerezza.platform.users.WebIdGraphsService;
View
15 platform.dashboard/platform.dashboard.tests/pom.xml
@@ -36,11 +36,6 @@
<dependencies>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
<scope>provided</scope>
</dependency>
@@ -141,11 +136,6 @@
</dependency>
<dependency>
<groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
<artifactId>wymiwyg-commons-core</artifactId>
<scope>provided</scope>
</dependency>
@@ -186,11 +176,6 @@
<version>6.1.12</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi-osgi</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
<artifactId>com.ibm.icu</artifactId>
View
40 ....graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/GraphNodeProvider.scala
@@ -61,20 +61,36 @@ class GraphNodeProvider extends Logging {
def getLocal(uriRef: UriRef): GraphNode = {
get(uriRef, true)
}
-
+
+
+ /**
+ *return true iff getLocal(uriRef).getNodeContext.size > 0
+ */
+ def existsLocal(uriRef: UriRef): Boolean = {
+ val cgGraph = cgProvider.getContentGraph
+ lazy val localInstanceUri = {
+ val uri = new java.net.URI(uriRef.getUnicodeString)
+ new UriRef(Constants.URN_LOCAL_INSTANCE + uri.getPath)
+ }
+ //TODO handle /user/
+ existsInGraph(uriRef,cgGraph) || existsInGraph(localInstanceUri, cgGraph)
+ }
+
+ private[this] def existsInGraph(nodeUri: UriRef, tc: LockableMGraph): Boolean = {
+ var readLock: Lock = tc.getLock.readLock
+ readLock.lock
+ try {
+ return tc.filter(nodeUri, null, null).hasNext || tc.filter(null, null, nodeUri).hasNext
+ }
+ finally {
+ readLock.unlock
+ }
+ }
+
+
private def get(uriRef: UriRef, isLocal: Boolean): GraphNode = {
val uriString = uriRef.getUnicodeString
- def existsInGraph(nodeUri: UriRef, tc: LockableMGraph): Boolean =
- {
- var readLock: Lock = tc.getLock.readLock
- readLock.lock
- try {
- return tc.filter(nodeUri, null, null).hasNext || tc.filter(null, null, nodeUri).hasNext
- }
- finally {
- readLock.unlock
- }
- }
+
val uriPath = {
val uri = new java.net.URI(uriString)
View
14 platform.launcher.storageless.parent/platform.launcher.storageless/pom.xml
@@ -273,7 +273,7 @@
<scope>provided</scope>
<version>0.7.2</version>
</dependency> -->
- <dependency>
+ <!-- <dependency>
<groupId>org.wymiwyg</groupId>
<artifactId>jetty-osgi-httpservice</artifactId>
<scope>provided</scope>
@@ -332,7 +332,17 @@
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
<version>3.0.20100224</version>
- </dependency>
+ </dependency> -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.whiteboard</artifactId>
+ <version>2.2.0</version>
+ </dependency>
<!-- Apache Felix framework bundles -->
<dependency>
<groupId>org.apache.felix</groupId>
View
57 platform.launcher.storageless.parent/pom.xml
@@ -46,16 +46,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi-osgi</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.apache.clerezza.ext</groupId>
<artifactId>com.hp.hpl.jena</artifactId>
<scope>runtime</scope>
@@ -205,13 +195,18 @@
<artifactId>platform.accountcontrolpanel.ontologies</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>triaxrs</artifactId>
- <!-- this has to start early, because of the MEdiaType requiring RuntimeImpl in
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-osgi</artifactId>
+ <version>1.2.1-incubating</version>
+ <!-- this has to start early, because of the MEdiaType requiring RuntimeImpl in
static iinitializer -->
- <scope>provided</scope>
- </dependency>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.utils</artifactId>
@@ -370,17 +365,17 @@
<artifactId>rdf.web.ontologies</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security</artifactId>
<scope>runtime</scope>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security.conditions</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security.foafssl.core</artifactId>
<scope>runtime</scope>
@@ -409,7 +404,27 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security.auth.cookie</artifactId>
<scope>runtime</scope>
- </dependency>
+ </dependency> -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.security</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.authentication.basic</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.security.fexilwebconsole</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.usermanagement</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typehandlerspace</artifactId>
@@ -560,7 +575,7 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.style.classic.webguiexamples</artifactId>
<scope>runtime</scope>
- </dependency>
+ </dependency>wr
-->
<dependency>
<groupId>org.apache.clerezza</groupId>
View
7 platform.mail/pom.xml
@@ -60,9 +60,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.security</artifactId>
- </dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.security</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>permissiondescriptions</artifactId>
View
2  platform.mail/src/main/java/org/apache/clerezza/platform/mail/MailManPermission.java
@@ -24,7 +24,7 @@
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.clerezza.platform.security.UserUtil;
+import org.apache.stanbol.commons.security.UserUtil;
/**
* A permission to send e-mails as a specific user.
View
2  platform.mail/src/test/java/org/apache/clerezza/platform/mail/MailManPermissionTest.java
@@ -23,7 +23,7 @@
import java.util.Collections;
import javax.security.auth.Subject;
import org.junit.Test;
-import org.apache.clerezza.platform.security.auth.PrincipalImpl;
+import org.apache.stanbol.commons.security.auth.PrincipalImpl;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertEquals;
View
201 platform.security.auth.basic/LICENSE
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
View
53 platform.security.auth.basic/pom.xml
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
-<!--
-
- 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.
-
--->
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>clerezza</artifactId>
- <groupId>org.apache.clerezza</groupId>
- <version>0.3-incubating-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.security.auth.basic</artifactId>
- <packaging>bundle</packaging>
- <version>0.5-incubating-SNAPSHOT</version>
- <name>Clerezza - Platform Security Basic Authentication</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wrhapi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wymiwyg-commons-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.security</artifactId>
- </dependency>
- </dependencies>
-</project>
View
141 ...urity.auth.basic/src/main/java/org/apache/clerezza/platform/security/auth/basic/BasicAuthentication.java
@@ -1,141 +0,0 @@
-/*
- * 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.
- */
-package org.apache.clerezza.platform.security.auth.basic;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.channels.Channels;
-import java.nio.channels.ReadableByteChannel;
-import java.security.AccessControlException;
-import java.util.Collections;
-
-import org.apache.clerezza.platform.security.UserUtil;
-import org.osgi.service.component.ComponentContext;