You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2014/08/06 21:12:33 UTC
git commit: CLEREZZA-938: removed platform.testing project
Repository: clerezza
Updated Branches:
refs/heads/master 86885e800 -> b120f8285
CLEREZZA-938: removed platform.testing project
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/b120f828
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/b120f828
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/b120f828
Branch: refs/heads/master
Commit: b120f8285289d91bae453144e50c336fa3273fa8
Parents: 86885e8
Author: Reto Gmür <re...@apache.org>
Authored: Wed Aug 6 21:11:59 2014 +0200
Committer: Reto Gmür <re...@apache.org>
Committed: Wed Aug 6 21:11:59 2014 +0200
----------------------------------------------------------------------
platform.testing/LICENSE | 201 ---------
platform.testing/pom.xml | 437 -------------------
.../osgi/FelixClerezzaPlatformTest.java | 392 -----------------
.../blackbox/osgi/RDFListRootResource.java | 55 ---
.../blackbox/osgi/SimpleRootResource.java | 39 --
.../osgi/SomeContentWebRenderingService.java | 32 --
.../blackbox/osgi/renderingServiceTest.ssp | 24 -
7 files changed, 1180 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/b120f828/platform.testing/LICENSE
----------------------------------------------------------------------
diff --git a/platform.testing/LICENSE b/platform.testing/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/platform.testing/LICENSE
+++ /dev/null
@@ -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.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/b120f828/platform.testing/pom.xml
----------------------------------------------------------------------
diff --git a/platform.testing/pom.xml b/platform.testing/pom.xml
deleted file mode 100644
index 742584d..0000000
--- a/platform.testing/pom.xml
+++ /dev/null
@@ -1,437 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!--
-
- 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.
-
---><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">
- <parent>
- <artifactId>clerezza</artifactId>
- <groupId>org.apache.clerezza</groupId>
- <version>0.2-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.testing</artifactId>
- <version>0.2-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Clerezza - Platform Tests</name>
- <description>Tests for Clerezza Platform.</description>
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>org.apache.jena</artifactId>
- </dependency>
- <!-- <dependency>
- <groupId>org.apache.felix</groupId>
- <version>1.0.0</version>
- <artifactId>org.apache.felix.log</artifactId>
- <scope>provided</scope>
- </dependency> -->
- <dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-api</artifactId>
- <scope>provided</scope>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-service</artifactId>
- <scope>provided</scope>
- <version>1.5.2</version>
- <!-- <exclusions>
- <exclusion>
- <artifactId>jmxri</artifactId>
- <groupId>com.sun.jmx</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jmxtools</artifactId>
- <groupId>com.sun.jdmk</groupId>
- </exclusion>
- </exclusions> -->
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>org.openrdf.sesame</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.sesame.storage</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wymiwyg-commons-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza.scala</groupId>
- <artifactId>scala-library-osgi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza.scala</groupId>
- <artifactId>scala-compiler-osgi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza.scala</groupId>
- <artifactId>script-engine</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>utils.customproperty</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>permissiondescriptions</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.utils</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.metadata</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.facade</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.commons</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.storage</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.sparql</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.parser</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.serializer</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.rdfjson</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.ontologies</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>utils</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.content.imagemetadata</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.content</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.graphprovider.content</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.ontologies</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.globalmenu.api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>web.fileserver</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>jaxrs.rdf.providers</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.web.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.web.ontologies</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typehandlerspace</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.mail</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>templating</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>templating.seedsnipe</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>jaxrs.utils</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>jaxrs.extensions</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typerendering.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typerendering.scala</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typerendering.ontologies</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typerendering.seedsnipe</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typerendering.manager</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.scripting</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.scripting.scriptmanager</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.xhtml2html</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>web.resources.jquery</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>web.resources.yui</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>utils.imageprocessing</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>web.resources.scripts</artifactId>
- <scope>provided</scope>
- </dependency>
-<!--
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.style.classic</artifactId>
- <scope>provided</scope>
- </dependency>
--->
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typerendering.scalaserverpages</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.scala.utils</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.config</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.documentation</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.documentation.viewer</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.language.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.style.classic.webguiexamples</artifactId>
- <scope>provided</scope>
- </dependency>
-
-<!-- pax exam related stuff -->
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.swissbox</groupId>
- <artifactId>pax-swissbox-tinybundles</artifactId>
- <version>1.3.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-default</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>com.ibm.icu</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit-extender-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit-extender</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <!-- no sources here, preventing failing invocation -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <phase/>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>maven-paxexam-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <!-- <repositories>
- <repository>
- <id>codehaus-repository</id>
- <name>Codehaus Repository</name>
- <url>http://repository.codehaus.org</url>
- </repository>
- </repositories> -->
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/clerezza/blob/b120f828/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
----------------------------------------------------------------------
diff --git a/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java b/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
deleted file mode 100644
index 4d40749..0000000
--- a/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
+++ /dev/null
@@ -1,392 +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.testing.blackbox.osgi;
-
-import java.io.ByteArrayOutputStream;
-import static org.ops4j.pax.exam.CoreOptions.felix;
-import static org.ops4j.pax.exam.CoreOptions.frameworks;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.mavenConfiguration;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.configProfile;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.webProfile;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.dsProfile;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.profile;
-import static org.ops4j.pax.exam.junit.JUnitOptions.junitBundles;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.ws.rs.core.MediaType;
-
-import junit.framework.Assert;
-import org.apache.clerezza.platform.typerendering.RenderletManager;
-import org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet;
-import org.apache.clerezza.rdf.core.UriRef;
-
-import org.apache.clerezza.rdf.core.access.TcManager;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Customizer;
-import org.ops4j.pax.exam.Inject;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.framework.Constants;
-
-
-
-/**
- *
- * @author mir, reto
- */
-@RunWith(JUnit4TestRunner.class)
-public class FelixClerezzaPlatformTest {
-
- private static final int REQUESTS_PER_THREAD = 50;
- private static final int THREADS_COUNT = 10;
-
- @Configuration
- public static Option[] configuration() {
- return options(
- mavenConfiguration(),
- mavenBundle().groupId("org.osgi").artifactId(
- "org.osgi.core").versionAsInProject(),
- mavenBundle().groupId("org.osgi").artifactId(
- "org.osgi.compendium").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza.ext").artifactId(
- "com.hp.hpl.jena").versionAsInProject(),
- mavenBundle().groupId("org.ops4j.pax.logging").artifactId(
- "pax-logging-api").versionAsInProject(),
- mavenBundle().groupId("org.ops4j.pax.logging").artifactId(
- "pax-logging-service").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.rdf.core").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza.ext").artifactId(
- "org.openrdf.sesame").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.rdf.sesame.storage").versionAsInProject(),
- mavenBundle().groupId("org.wymiwyg").artifactId(
- "wrhapi").versionAsInProject(),
- mavenBundle().groupId("org.wymiwyg").artifactId(
- "wymiwyg-commons-core").versionAsInProject(),
- mavenBundle().groupId("org.wymiwyg").artifactId(
- "wrhapi-osgi").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza.ext").artifactId(
- "com.ibm.icu").versionAsInProject(),
- /*mavenBundle().groupId("org.apache.felix").artifactId(
- "org.apache.felix.scr").version("1.0.6"),
- mavenBundle().groupId("org.apache.felix").artifactId(
- "org.apache.felix.eventadmin").version("1.0.0"),
- mavenBundle().groupId("org.apache.felix").artifactId(
- "org.apache.felix.metatype").version("1.0.2"),*/
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.triaxrs").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza.ext").artifactId(
- "javax.mail").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza.ext").artifactId(
- "org.json.simple").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.rdf.utils").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.jaxrs.rdf.providers").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.jaxrs.utils").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.rdf.ontologies").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.config").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.graphprovider.content").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.templating").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza.scala").artifactId(
- "scala-compiler-osgi").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza.scala").artifactId(
- "scala-library-osgi").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza.scala").artifactId(
- "script-engine").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.permissiondescriptions").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.typerendering.scalaserverpages").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.rdf.scala.utils").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.typerendering.ontologies").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.typerendering.core").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.templating.seedsnipe").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.typerendering.seedsnipe").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.mail").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.utils.customproperty").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.globalmenu.api").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.dashboard.ontologies").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.web.fileserver").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.content").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.typehandlerspace").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.web.resources.jquery").startLevel(4).versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.usermanager").startLevel(4).versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.security").startLevel(4).versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.security.conditions").startLevel(4).versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.scripting").startLevel(4).versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.rdf.jena.sparql").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.rdf.jena.parser").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.rdf.jena.serializer").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.rdf.rdfjson").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.rdf.web.ontologies").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.rdf.web.core").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.typerendering.manager").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.typerendering.scala").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.scripting.scriptmanager").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.xhtml2html").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.web.resources.yui").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.permissiondescriptions").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.utils.imageprocessing").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.language.core").versionAsInProject(),
- mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.language.ontologies").versionAsInProject(),
- mavenBundle().groupId("org.apache.httpcomponents").artifactId(
- "httpcore-osgi").versionAsInProject(),
- mavenBundle().groupId("org.mortbay.jetty").artifactId(
- "servlet-api-2.5").version("6.1.12"),
- dsProfile(),
- profile("felix.webconsole"),
- configProfile(),
- webProfile(),
- junitBundles(),
- vmOption("-XX:MaxPermSize=200m"),
- frameworks(felix()),
- systemProperty("org.osgi.service.http.port").value(
- Integer.toString(testHttpPort)),
- new Customizer() {
-
- @Override
- public InputStream customizeTestProbe(InputStream testProbe)
- throws IOException {
- return TinyBundles.modifyBundle(testProbe).
- set(Constants.EXPORT_PACKAGE, "org.apache.clerezza.platform.testing.blackbox.osgi").build();
- }
- });
- }
- protected final static int testHttpPort = 8976;
- @Inject
- private BundleContext bundleContext;
- private boolean webServerExist;
-
- @Before
- public void registerServices() throws Exception {
- webServerExist = waitForWebserver();
- Assert.assertTrue("webserver running on port " + testHttpPort,
- webServerExist);
- Thread.sleep(10000);
- }
-
- /**
- * multiple tests that run within the lifetime of the same instance
- *
- * @throws Exception
- */
- @Test
- public void multi() throws Exception {
- checkTcManagerService();
- testJaxRsRegistration();
- testWithScalaServerPage();
- }
-
- private void testJaxRsRegistration() throws InterruptedException, IOException {
- final Dictionary<String, Object> jaxRsResourceProperty = new Hashtable<String, Object>();
- {
- jaxRsResourceProperty.put("javax.ws.rs", Boolean.TRUE);
- jaxRsResourceProperty.put("service.pid", SimpleRootResource.class.getName());
- }
- bundleContext.registerService(Object.class.getName(),
- new SimpleRootResource(), jaxRsResourceProperty);
- URL url = new URL("http://localhost:" + testHttpPort + "/foo");
- Thread.sleep(4000);
- requestUrl(url);//"/admin/users/list-users"));
- runRequestThreads(url);
- }
-
- private void testWithScalaServerPage() throws InterruptedException, IOException {
- registerRDFListRootResource();
- final Dictionary<String, Object> webRenderingServiceProperty = new Hashtable<String, Object>();
- {
- webRenderingServiceProperty.put("service.pid", SomeContentWebRenderingService.class.getName());
- }
- bundleContext.registerService(SomeContentWebRenderingService.class.getName(),
- new SomeContentWebRenderingService(), webRenderingServiceProperty);
- RenderletManager renderletManager = waitFor(RenderletManager.class, 20000);
- renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
- new UriRef(getClass().getResource("renderingServiceTest.ssp").toString()),
- RDFListRootResource.testType, null, MediaType.TEXT_PLAIN_TYPE, false);
- URL url = new URL("http://localhost:" + testHttpPort + "/list");
- Thread.sleep(4000);
- String returnedString = new String(requestUrl(url), "utf-8");
- Assert.assertEquals("some content", returnedString);
-
- }
-
- private void checkTcManagerService() throws Exception {
- Object service = waitFor(TcManager.class, 20000);
- Assert.assertTrue(service != null);
-
- }
-
- private <T> T waitFor(Class<T> aClass, long timeout)
- throws InterruptedException {
- ServiceTracker tracker = new ServiceTracker(bundleContext,
- aClass.getName(), null);
- tracker.open();
- T service = (T)tracker.waitForService(timeout);
- return service;
- }
-
- private boolean waitForWebserver() throws InterruptedException {
- int j = 0;
- try {
- URL serverURL = new URL("http://localhost:" + testHttpPort + "/");
- while (true) {
- try {
- serverURL.openConnection().getInputStream();
- } catch (FileNotFoundException ex) {
- break;
- } catch (IOException ex) {
- System.out.println("waiting (" + ex + ") - Iteration: "+j);
- Thread.sleep(3000);
- if (j++ < 100) {
- continue;
- }
- }
- break;
- }
- } catch (MalformedURLException ex) {
- Logger.getLogger(FelixClerezzaPlatformTest.class.getName()).log(
- Level.SEVERE, null, ex);
- }
- return j < 100;
- }
-
- private void runRequestThreads(final URL url) throws MalformedURLException,
- InterruptedException {
- RequestThread[] requestThread = new RequestThread[THREADS_COUNT];
- for (int i = 0; i < THREADS_COUNT; i++) {
- requestThread[i] = new RequestThread(url);
- }
- for (int i = 0; i < THREADS_COUNT; i++) {
- requestThread[i].start();
- }
- int successfulRequests = 0;
- for (int i = 0; i < THREADS_COUNT; i++) {
- requestThread[i].join();
- successfulRequests += requestThread[i].successfulRequests;
- }
- Assert.assertEquals(REQUESTS_PER_THREAD * THREADS_COUNT,
- successfulRequests);
- }
-
- private void registerRDFListRootResource() {
- final Dictionary<String, Object> jaxRsResourceProperty = new Hashtable<String, Object>();
- {
- jaxRsResourceProperty.put("javax.ws.rs", Boolean.TRUE);
- jaxRsResourceProperty.put("service.pid", RDFListRootResource.class.getName());
- }
- bundleContext.registerService(Object.class.getName(),
- new RDFListRootResource(), jaxRsResourceProperty);
- }
-
- static class RequestThread extends Thread {
-
- private URL url;
- int successfulRequests = 0;
-
- public RequestThread(URL url) {
- this.url = url;
- }
-
- @Override
- public void run() {
- try {
- for (int i = 0; i < REQUESTS_PER_THREAD; i++) {
- requestUrl(url);
- successfulRequests++;
- }
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- }
- }
-
- private static byte[] requestUrl(URL url) throws IOException {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- URLConnection urlConnection = url.openConnection();
- InputStream in = urlConnection.getInputStream();
- for (int ch = in.read(); ch != -1; ch = in.read()) {
- baos.write(ch);
- }
- return baos.toByteArray();
- }
-}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/b120f828/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/RDFListRootResource.java
----------------------------------------------------------------------
diff --git a/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/RDFListRootResource.java b/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/RDFListRootResource.java
deleted file mode 100644
index 21566c5..0000000
--- a/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/RDFListRootResource.java
+++ /dev/null
@@ -1,55 +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.testing.blackbox.osgi;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-import org.apache.clerezza.rdf.ontologies.RDF;
-import org.apache.clerezza.rdf.utils.GraphNode;
-import org.apache.clerezza.rdf.utils.RdfList;
-
-/**
- *
- * @author reto
- */
-@Path("/list")
-public class RDFListRootResource {
-
- static final public UriRef testType = new UriRef("http://example.org/foo");
-
-
- @GET
- public GraphNode sayHello() {
- TripleCollection resultGraph = new SimpleMGraph();
- GraphNode result = new GraphNode(new BNode(), resultGraph);
- result.addProperty(RDF.type, testType);
- RdfList list = new RdfList(result);
- for (int i = 0; i < 10 ; i++) {
- list.add(new PlainLiteralImpl("number "+i));
- }
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/b120f828/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/SimpleRootResource.java
----------------------------------------------------------------------
diff --git a/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/SimpleRootResource.java b/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/SimpleRootResource.java
deleted file mode 100644
index b37f02d..0000000
--- a/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/SimpleRootResource.java
+++ /dev/null
@@ -1,39 +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.testing.blackbox.osgi;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-/**
- *
- * @author reto
- */
-@Path("/foo")
-public class SimpleRootResource {
-
- static final public String greeting = "hello";
-
- @GET
- @Produces("text/plain")
- public String sayHello() {
- return greeting;
- }
-}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/b120f828/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/SomeContentWebRenderingService.java
----------------------------------------------------------------------
diff --git a/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/SomeContentWebRenderingService.java b/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/SomeContentWebRenderingService.java
deleted file mode 100644
index 30039ae..0000000
--- a/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/SomeContentWebRenderingService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2010 reto.
- *
- * 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.
- * under the License.
- */
-
-package org.apache.clerezza.platform.testing.blackbox.osgi;
-
-import org.apache.clerezza.platform.typerendering.WebRenderingService;
-
-/**
- *
- * @author reto
- */
-@WebRenderingService
-public class SomeContentWebRenderingService {
-
- public String getSomeContent() {
- return "some content";
- }
-}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/b120f828/platform.testing/src/test/resources/org/apache/clerezza/platform/testing/blackbox/osgi/renderingServiceTest.ssp
----------------------------------------------------------------------
diff --git a/platform.testing/src/test/resources/org/apache/clerezza/platform/testing/blackbox/osgi/renderingServiceTest.ssp b/platform.testing/src/test/resources/org/apache/clerezza/platform/testing/blackbox/osgi/renderingServiceTest.ssp
deleted file mode 100644
index f39dfc4..0000000
--- a/platform.testing/src/test/resources/org/apache/clerezza/platform/testing/blackbox/osgi/renderingServiceTest.ssp
+++ /dev/null
@@ -1,24 +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.
- *
-*/
-
-import org.apache.clerezza.platform.testing.blackbox.osgi._
-
-$[SomeContentWebRenderingService].getSomeContent