Return-Path: X-Original-To: apmail-incubator-clerezza-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-clerezza-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 91F1FD948 for ; Fri, 30 Nov 2012 18:58:35 +0000 (UTC) Received: (qmail 75653 invoked by uid 500); 30 Nov 2012 18:58:35 -0000 Delivered-To: apmail-incubator-clerezza-commits-archive@incubator.apache.org Received: (qmail 75627 invoked by uid 500); 30 Nov 2012 18:58:35 -0000 Mailing-List: contact clerezza-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: clerezza-dev@incubator.apache.org Delivered-To: mailing list clerezza-commits@incubator.apache.org Received: (qmail 75620 invoked by uid 99); 30 Nov 2012 18:58:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Nov 2012 18:58:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Nov 2012 18:58:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5E454238899C; Fri, 30 Nov 2012 18:58:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1415790 - in /incubator/clerezza/trunk: ./ jaxrs.stanbol.fragments/ jaxrs.stanbol.fragments/src/ jaxrs.stanbol.fragments/src/main/ jaxrs.stanbol.fragments/src/main/appended-resources/ jaxrs.stanbol.fragments/src/main/appended-resources/MET... Date: Fri, 30 Nov 2012 18:58:06 -0000 To: clerezza-commits@incubator.apache.org From: reto@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121130185808.5E454238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: reto Date: Fri Nov 30 18:58:05 2012 New Revision: 1415790 URL: http://svn.apache.org/viewvc?rev=1415790&view=rev Log: CLEREZZA-722: The Jax-RS instance of WebFragments are now loaded and registered, thanks to this the user-manager on the felix webconsole seems to work like in stanbol Added: incubator/clerezza/trunk/jaxrs.stanbol.fragments/ (with props) incubator/clerezza/trunk/jaxrs.stanbol.fragments/LICENSE incubator/clerezza/trunk/jaxrs.stanbol.fragments/pom.xml incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/ incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/ incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/appended-resources/ incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/appended-resources/META-INF/ incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/scala/ incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/scala/org/ incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/scala/org/apache/ incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/scala/org/apache/clerezza/ incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/scala/org/apache/clerezza/jaxrs/ incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/scala/org/apache/clerezza/jaxrs/stanbol/ incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/scala/org/apache/clerezza/jaxrs/stanbol/webfragements/ incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/scala/org/apache/clerezza/jaxrs/stanbol/webfragements/WebFragmentRunner.scala Modified: incubator/clerezza/trunk/parent/pom.xml incubator/clerezza/trunk/platform.launcher.storageless.parent/pom.xml incubator/clerezza/trunk/pom.xml incubator/clerezza/trunk/shell/pom.xml Propchange: incubator/clerezza/trunk/jaxrs.stanbol.fragments/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Nov 30 18:58:05 2012 @@ -0,0 +1,3 @@ +jaxrs.stanbol.fragments.iml +.idea +target Added: incubator/clerezza/trunk/jaxrs.stanbol.fragments/LICENSE URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/jaxrs.stanbol.fragments/LICENSE?rev=1415790&view=auto ============================================================================== --- incubator/clerezza/trunk/jaxrs.stanbol.fragments/LICENSE (added) +++ incubator/clerezza/trunk/jaxrs.stanbol.fragments/LICENSE Fri Nov 30 18:58:05 2012 @@ -0,0 +1,201 @@ + 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. Added: incubator/clerezza/trunk/jaxrs.stanbol.fragments/pom.xml URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/jaxrs.stanbol.fragments/pom.xml?rev=1415790&view=auto ============================================================================== --- incubator/clerezza/trunk/jaxrs.stanbol.fragments/pom.xml (added) +++ incubator/clerezza/trunk/jaxrs.stanbol.fragments/pom.xml Fri Nov 30 18:58:05 2012 @@ -0,0 +1,120 @@ + + + + 4.0.0 + + clerezza + org.apache.clerezza + 0.3-incubating-SNAPSHOT + ../parent + + org.apache.clerezza + jaxrs.stanbol.fragments + bundle + 0.1-incubating-SNAPSHOT + Clerezza - Support for Stanbol Webfragments + Adds support to use Stanbol webfragments based applications in clerezza + + + javax.ws.rs + jsr311-api + + + junit + junit + test + + + org.apache.felix + org.apache.felix.scr.annotations + 1.7.0 + + + + org.apache.clerezza + jaxrs.testutils + test + 0.9-incubating + + + org.apache.clerezza.ext + org.json.simple + + + org.apache.stanbol + org.apache.stanbol.commons.web.base + 0.10.1-SNAPSHOT + + + org.scala-lang + scala-library + + + org.apache.clerezza.ext + slf4j-scala-api + + + org.osgi + org.osgi.core + + + org.osgi + org.osgi.compendium + + + org.apache.clerezza + osgi.services + + + + src/main/scala + src/test/scala + + + org.scala-tools + maven-scala-plugin + + + org.apache.felix + maven-bundle-plugin + 2.3.7 + + + !org.apache.felix.scr.annotations, * + + + + + org.apache.felix + maven-scr-plugin + 1.8.1-SNAPSHOT + + true + + true + + + + + + Added: incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/scala/org/apache/clerezza/jaxrs/stanbol/webfragements/WebFragmentRunner.scala URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/scala/org/apache/clerezza/jaxrs/stanbol/webfragements/WebFragmentRunner.scala?rev=1415790&view=auto ============================================================================== --- incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/scala/org/apache/clerezza/jaxrs/stanbol/webfragements/WebFragmentRunner.scala (added) +++ incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/scala/org/apache/clerezza/jaxrs/stanbol/webfragements/WebFragmentRunner.scala Fri Nov 30 18:58:05 2012 @@ -0,0 +1,91 @@ +/* + * Copyright 2012 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.clerezza.jaxrs.stanbol.webfragements + +import org.apache.clerezza.osgi.services.ActivationHelper +import org.apache.felix.scr.annotations._ +import org.apache.stanbol.commons.web.base.WebFragment +import org.osgi.framework.BundleContext +import org.osgi.service.component.ComponentContext + + +@Component +@Reference(name = "webFragment", + referenceInterface = classOf[WebFragment], + cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, + policy = ReferencePolicy.DYNAMIC) +class WebFragmentRunner { + + println("constructing"); + + private var webFragments: List[WebFragment] = Nil + private var bundleContext: BundleContext = _ + private var activator: Option[ActivationHelper] = None + + @Activate + def activate(c: ComponentContext) { + synchronized { + println("activating with "+webFragments); + bundleContext = c.getBundleContext + registerFragments() + } + } + + @Deactivate + def deactivate(c: ComponentContext) { + synchronized { + activator.foreach(_.stop(c.getBundleContext)) + activator = None + } + } + + private def registerFragments() { + activator = Some(new ActivationHelper { + + for (f <- webFragments) { + import scala.collection.JavaConverters._ + for (s <- f.getJaxrsResourceSingletons.asScala) { + registerRootResource(s) + println("Registered: "+s) + } + println(f) + } + start (bundleContext) + }) + } + + protected def bindWebFragment(f: WebFragment) { + synchronized { + webFragments ::= f + activator.foreach { a => + a.stop(bundleContext); + registerFragments() + } + } + } + + protected def unbindWebFragment(f: WebFragment) { + synchronized { + webFragments = webFragments diff List(f) + activator.foreach { a=> + a.stop(bundleContext); + registerFragments() + } + } + } + +} Modified: incubator/clerezza/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/pom.xml?rev=1415790&r1=1415789&r2=1415790&view=diff ============================================================================== --- incubator/clerezza/trunk/parent/pom.xml (original) +++ incubator/clerezza/trunk/parent/pom.xml Fri Nov 30 18:58:05 2012 @@ -353,7 +353,7 @@ javax.ws.rs jsr311-api - 1.0 + 1.1.1 log4j @@ -765,6 +765,11 @@ jaxrs.rdf.providers 0.14-incubating-SNAPSHOT + + org.apache.clerezza + jaxrs.stanbol.fragments + 0.1-incubating-SNAPSHOT + org.apache.clerezza.ext com.ibm.icu Modified: incubator/clerezza/trunk/platform.launcher.storageless.parent/pom.xml URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.launcher.storageless.parent/pom.xml?rev=1415790&r1=1415789&r2=1415790&view=diff ============================================================================== --- incubator/clerezza/trunk/platform.launcher.storageless.parent/pom.xml (original) +++ incubator/clerezza/trunk/platform.launcher.storageless.parent/pom.xml Fri Nov 30 18:58:05 2012 @@ -355,6 +355,11 @@ jaxrs.rdf.providers runtime + + org.apache.clerezza + jaxrs.stanbol.fragments + runtime + org.apache.clerezza rdf.web.core @@ -425,6 +430,51 @@ org.apache.stanbol.commons.usermanagement 0.10.0-SNAPSHOT + + at.newmedialab.ldpath + ldpath-api + 0.9.5 + + + at.newmedialab.ldpath + ldpath-core-bundle + 0.9.5 + + + org.apache.stanbol + org.apache.stanbol.commons.ldpath.clerezza + 0.10.0-SNAPSHOT + + + org.apache.stanbol + org.apache.stanbol.commons.ldpathtemplate + 0.10.0-SNAPSHOT + + + org.apache.stanbol + org.apache.stanbol.commons.viewable + 0.10.0-SNAPSHOT + + + org.apache.stanbol + org.apache.stanbol.commons.web.base + 0.10.1-SNAPSHOT + + + org.apache.stanbol + org.apache.stanbol.commons.jsonld + 0.10.0-SNAPSHOT + + + org.codehaus.jettison + jettison + 1.3.1 + + + commons-collections + commons-collections + 3.2.1 + org.apache.clerezza platform.typehandlerspace Modified: incubator/clerezza/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/pom.xml?rev=1415790&r1=1415789&r2=1415790&view=diff ============================================================================== --- incubator/clerezza/trunk/pom.xml (original) +++ incubator/clerezza/trunk/pom.xml Fri Nov 30 18:58:05 2012 @@ -85,6 +85,7 @@ scala-scripting jaxrs.extensions jaxrs.rdf.providers + jaxrs.stanbol.fragments jaxrs.utils maven-jaxrs-report-plugin maven-ontologies-plugin Modified: incubator/clerezza/trunk/shell/pom.xml URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/shell/pom.xml?rev=1415790&r1=1415789&r2=1415790&view=diff ============================================================================== --- incubator/clerezza/trunk/shell/pom.xml (original) +++ incubator/clerezza/trunk/shell/pom.xml Fri Nov 30 18:58:05 2012 @@ -25,6 +25,7 @@ org.apache.clerezza clerezza 0.3-incubating-SNAPSHOT + ../parent shell 0.2-incubating-SNAPSHOT