clerezza-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [50/51] [partial] clerezza git commit: CLEREZZA-1012: reduced clerezza to core components, the rest stays in legacy-branch
Date Mon, 03 Oct 2016 15:50:16 GMT
http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/alerts.txt
----------------------------------------------------------------------
diff --git a/alerts.txt b/alerts.txt
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/bundledevtool/LICENSE
----------------------------------------------------------------------
diff --git a/bundledevtool/LICENSE b/bundledevtool/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/bundledevtool/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/14575ea3/bundledevtool/pom.xml
----------------------------------------------------------------------
diff --git a/bundledevtool/pom.xml b/bundledevtool/pom.xml
deleted file mode 100644
index 274bfbc..0000000
--- a/bundledevtool/pom.xml
+++ /dev/null
@@ -1,124 +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>
-        <groupId>org.apache.clerezza</groupId>
-        <artifactId>clerezza</artifactId>
-        <version>0.5</version>
-        <relativePath>../parent</relativePath>
-     </parent>
-    <artifactId>bundledevtool</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Clerezza - Bundle Development Tools</name>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.clerezza.scala</groupId>
-            <artifactId>script-engine</artifactId>
-            <version>0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-compiler</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.swissbox</groupId>
-            <artifactId>pax-swissbox-tinybundles</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>utils</artifactId>
-            <version>0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>shell</artifactId>
-            <version>0.3</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <sourceDirectory>src/main/scala</sourceDirectory>
-    <testSourceDirectory>src/test/scala</testSourceDirectory>
-        <plugins>
-             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-scr-scrdescriptor</id>
-                    <phase>none</phase>
-                </execution>
-                </executions> 
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Service-Component>OSGI-INF/serviceComponents.xml</Service-Component>
-                        <Export-Package>org.apache.clerezza.bundledevtool</Export-Package>
-                        <Private-Package>sbt,sbt.*</Private-Package>
-                        <Bundle-SymbolicName>org.apache.clerezza.bundledevtool</Bundle-SymbolicName>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <configuration>
-                    <downloadSources>true</downloadSources>
-                    <downloadJavadocs>true</downloadJavadocs>
-                    <buildcommands>
-                        <buildcommand>ch.epfl.lamp.sdt.core.scalabuilder</buildcommand>
-                    </buildcommands>
-                    <additionalProjectnatures>
-                        <projectnature>ch.epfl.lamp.sdt.core.scalanature</projectnature>
-                    </additionalProjectnatures>
-                    <classpathContainers>
-                        <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER
-                        </classpathContainer>
-                        <classpathContainer>ch.epfl.lamp.sdt.launching.SCALA_CONTAINER
-                        </classpathContainer>
-                    </classpathContainers>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.scala-tools</groupId>
-                <artifactId>maven-scala-plugin</artifactId>
-
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/bundledevtool/src/main/appended-resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/bundledevtool/src/main/appended-resources/META-INF/NOTICE b/bundledevtool/src/main/appended-resources/META-INF/NOTICE
deleted file mode 100644
index 30b96b1..0000000
--- a/bundledevtool/src/main/appended-resources/META-INF/NOTICE
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Uses code from: http://code.google.com/p/simple-build-tool/

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/bundledevtool/src/main/resources/META-INF/documentation.nt
----------------------------------------------------------------------
diff --git a/bundledevtool/src/main/resources/META-INF/documentation.nt b/bundledevtool/src/main/resources/META-INF/documentation.nt
deleted file mode 100644
index 022631d..0000000
--- a/bundledevtool/src/main/resources/META-INF/documentation.nt
+++ /dev/null
@@ -1,52 +0,0 @@
-<bundle:///intro-content-el/0> <http://discobits.org/ontology#infoBit> "The Bundle Development Tool provides utility for developing new bundles on Clerezza. It allows to edit Scala source files as well as other resources on a file-system location an have the changes automatically reflected on the local instance. The tool takes care about compiling the sources and recreating the bundle."^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///intro-content-el/0> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///intro-content-el/1-content> <http://discobits.org/ontology#infoBit> "To create a new project enter the following on the Clerezza console:\n<div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"tx-blockcode\">\nzz&gt; Dev create 'scala_with_activator in \"/path/to/new/project/\"\n</div>\nThe above will create a project using the archetype 'scala_with_activator at the location /path/to/new/project. Files and folder that do not yet exist will be created (no file is overwriiten).<br xmlns=\"http://www.w3.org/1999/xhtml\"></br>\nTo see alist of the available archetypes enter\n<div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"tx-blockcode\">\nzz&gt; Dev listArchetypes\n</div>"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///intro-content-el/1-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///intro-content-el/1-title> <http://discobits.org/ontology#infoBit> "Creating a new project"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///intro-content-el/1-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///intro-content-el/1> <http://discobits.org/ontology#contains> _:a2950b10a4e67d4ee8d25d131e9d59471 . 
-<bundle:///intro-content-el/1> <http://discobits.org/ontology#contains> _:e696a99dc91ebddcf13b5a4fd83e55991 . 
-<bundle:///intro-content-el/1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-<bundle:///intro-content-el/2-content> <http://discobits.org/ontology#infoBit> "To load an exiting project enter the following on the Clerezza console:\n<div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"tx-blockcode\">\nzz&gt; Dev load \"/path/to/existing/project/\"\n</div>"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///intro-content-el/2-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///intro-content-el/2-title> <http://discobits.org/ontology#infoBit> "Load an existing project"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///intro-content-el/2-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///intro-content-el/2> <http://discobits.org/ontology#contains> _:005cab2e8f532d75dbe6021467d5f7191 . 
-<bundle:///intro-content-el/2> <http://discobits.org/ontology#contains> _:3682407f1c90d02dcf9dbf4e83d964f51 . 
-<bundle:///intro-content-el/2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-<bundle:///intro-content> <http://discobits.org/ontology#contains> _:0c33aa960ad81e72549c579dd55074231 . 
-<bundle:///intro-content> <http://discobits.org/ontology#contains> _:16fd3882eda078006a6b02abb28816da1 . 
-<bundle:///intro-content> <http://discobits.org/ontology#contains> _:da78c47eff7d6e6f75a17d01572cb4d81 . 
-<bundle:///intro-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#OrderedContent> .
-<bundle:///intro-title> <http://discobits.org/ontology#infoBit> "Bundle Development Tool"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///intro-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///intro> <http://discobits.org/ontology#contains> _:2d0db51a9a2a40d89460edf6544edbad1 . 
-<bundle:///intro> <http://discobits.org/ontology#contains> _:566a75916142ac411441d067f09a49f71 . 
-<bundle:///intro> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-_:005cab2e8f532d75dbe6021467d5f7191 <http://discobits.org/ontology#holds> <bundle:///intro-content-el/2-content> . 
-_:005cab2e8f532d75dbe6021467d5f7191 <http://discobits.org/ontology#pos> "1" . 
-_:005cab2e8f532d75dbe6021467d5f7191 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:0c33aa960ad81e72549c579dd55074231 <http://discobits.org/ontology#holds> <bundle:///intro-content-el/2> . 
-_:0c33aa960ad81e72549c579dd55074231 <http://discobits.org/ontology#pos> "2" . 
-_:0c33aa960ad81e72549c579dd55074231 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:16fd3882eda078006a6b02abb28816da1 <http://discobits.org/ontology#holds> <bundle:///intro-content-el/0> . 
-_:16fd3882eda078006a6b02abb28816da1 <http://discobits.org/ontology#pos> "0" . 
-_:16fd3882eda078006a6b02abb28816da1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:2d0db51a9a2a40d89460edf6544edbad1 <http://discobits.org/ontology#holds> <bundle:///intro-title> . 
-_:2d0db51a9a2a40d89460edf6544edbad1 <http://discobits.org/ontology#pos> "0" . 
-_:2d0db51a9a2a40d89460edf6544edbad1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:3682407f1c90d02dcf9dbf4e83d964f51 <http://discobits.org/ontology#holds> <bundle:///intro-content-el/2-title> . 
-_:3682407f1c90d02dcf9dbf4e83d964f51 <http://discobits.org/ontology#pos> "0" . 
-_:3682407f1c90d02dcf9dbf4e83d964f51 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:566a75916142ac411441d067f09a49f71 <http://discobits.org/ontology#holds> <bundle:///intro-content> . 
-_:566a75916142ac411441d067f09a49f71 <http://discobits.org/ontology#pos> "1" . 
-_:566a75916142ac411441d067f09a49f71 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:a2950b10a4e67d4ee8d25d131e9d59471 <http://discobits.org/ontology#holds> <bundle:///intro-content-el/1-title> . 
-_:a2950b10a4e67d4ee8d25d131e9d59471 <http://discobits.org/ontology#pos> "0" . 
-_:a2950b10a4e67d4ee8d25d131e9d59471 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:da78c47eff7d6e6f75a17d01572cb4d81 <http://discobits.org/ontology#holds> <bundle:///intro-content-el/1> . 
-_:da78c47eff7d6e6f75a17d01572cb4d81 <http://discobits.org/ontology#pos> "1" . 
-_:da78c47eff7d6e6f75a17d01572cb4d81 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:e696a99dc91ebddcf13b5a4fd83e55991 <http://discobits.org/ontology#holds> <bundle:///intro-content-el/1-content> . 
-_:e696a99dc91ebddcf13b5a4fd83e55991 <http://discobits.org/ontology#pos> "1" . 
-_:e696a99dc91ebddcf13b5a4fd83e55991 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/bundledevtool/src/main/resources/OSGI-INF/serviceComponents.xml
----------------------------------------------------------------------
diff --git a/bundledevtool/src/main/resources/OSGI-INF/serviceComponents.xml b/bundledevtool/src/main/resources/OSGI-INF/serviceComponents.xml
deleted file mode 100644
index fd74981..0000000
--- a/bundledevtool/src/main/resources/OSGI-INF/serviceComponents.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-
-<components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-    <scr:component enabled="true" immediate="true" name="org.apache.clerezza.sourcebundle.BundleRoot">
-        <implementation class="org.apache.clerezza.bundledevtool.BundleRoot"/>
-        <property name="service.pid" value="org.apache.clerezza.bundledevtool.BundleRoot"/>
-        <service servicefactory="false">
-            <provide interface="org.apache.clerezza.bundledevtool.BundleRoot"/>
-        </service>
-        <reference name="CompilerService"
-                interface="org.apache.clerezza.scala.scripting.CompilerService"
-                cardinality="1..1"
-                bind="bindCompilerService" unbind="unbindCompilerService"/>
-        <reference name="PackageAdmin"
-                interface="org.osgi.service.packageadmin.PackageAdmin"
-                cardinality="1..1"
-                bind="bindPackageAdmin" unbind="unbindPackageAdmin"/>
-    </scr:component>
-    <scr:component enabled="true"  name="org.apache.clerezza.sourcebundle.DevShellCustomizer">
-        <implementation class="org.apache.clerezza.bundledevtool.DevShellCustomizer"/>
-        <property name="service.pid" value="org.apache.clerezza.bundledevtool.DevShellCustomizer"/>
-        <service servicefactory="false">
-            <provide interface="org.apache.clerezza.shell.ShellCustomizer"/>
-        </service>
-    </scr:component>
-</components>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/LICENSE
----------------------------------------------------------------------
diff --git a/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/LICENSE b/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/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/14575ea3/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/pom.xml
----------------------------------------------------------------------
diff --git a/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/pom.xml b/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/pom.xml
deleted file mode 100644
index 8dfb5f4..0000000
--- a/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/pom.xml
+++ /dev/null
@@ -1,122 +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">
-<!--
-
- 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>
-        <groupId>org.apache.clerezza</groupId>
-        <artifactId>clerezza</artifactId>
-        <version>0.3-SNAPSHOT</version>
-    </parent>
-    <artifactId>skeleton</artifactId>
-    <version>0.1-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Clerezza - Project Skeleton</name>
-    <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.typerendering.core</artifactId>
-            <version>0.3-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.typerendering.scala</artifactId>
-            <version>0.2-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.ontologies</artifactId>
-            <version>0.12-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.utils</artifactId>
-            <version>0.14-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.scala.utils</artifactId>
-            <version>0.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>osgi.services</artifactId>
-            <version>0.2-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-        </dependency>
-    </dependencies>
-    <build>
-        <sourceDirectory>src/main/scala</sourceDirectory>
-        <testSourceDirectory>src/test/scala</testSourceDirectory>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Bundle-activator>skeleton.Activator</Bundle-activator>
-                        <Export-Package>skeleton</Export-Package>
-                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <configuration>
-                    <downloadSources>true</downloadSources>
-                    <downloadJavadocs>true</downloadJavadocs>
-                    <buildcommands>
-                        <buildcommand>ch.epfl.lamp.sdt.core.scalabuilder</buildcommand>
-                    </buildcommands>
-                    <additionalProjectnatures>
-                        <projectnature>ch.epfl.lamp.sdt.core.scalanature</projectnature>
-                    </additionalProjectnatures>
-                    <classpathContainers>
-                        <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER
-                        </classpathContainer>
-                        <classpathContainer>ch.epfl.lamp.sdt.launching.SCALA_CONTAINER
-                        </classpathContainer>
-                    </classpathContainers>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.scala-tools</groupId>
-                <artifactId>maven-scala-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/resources/CLEREZZA-INF/web-resources/styles/hello-world/style.css
----------------------------------------------------------------------
diff --git a/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/resources/CLEREZZA-INF/web-resources/styles/hello-world/style.css b/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/resources/CLEREZZA-INF/web-resources/styles/hello-world/style.css
deleted file mode 100644
index 22f1ef2..0000000
--- a/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/resources/CLEREZZA-INF/web-resources/styles/hello-world/style.css
+++ /dev/null
@@ -1,25 +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.
- *
-*/
-
-.message {
-    color: green
-}
-

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/scala/Activator.scala
----------------------------------------------------------------------
diff --git a/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/scala/Activator.scala b/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/scala/Activator.scala
deleted file mode 100644
index 3e9a4be..0000000
--- a/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/scala/Activator.scala
+++ /dev/null
@@ -1,32 +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 skeleton
-
-import org.apache.clerezza.osgi.services.ActivationHelper
-
-/**
- * Activator for a bundle using Apache Clerezza.
- */
-class Activator extends ActivationHelper {
-  registerRootResource(new HelloWorld(context))
-  registerRenderlet(new HelloWorldMessageRenderlet)
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/scala/HelloWorld.scala
----------------------------------------------------------------------
diff --git a/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/scala/HelloWorld.scala b/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/scala/HelloWorld.scala
deleted file mode 100644
index e45976a..0000000
--- a/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/scala/HelloWorld.scala
+++ /dev/null
@@ -1,49 +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 skeleton
-
-import javax.ws.rs._
-import org.apache.clerezza.rdf.core.BNode
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph
-import org.apache.clerezza.rdf.ontologies.{DC, RDF}
-import org.apache.clerezza.rdf.utils.GraphNode
-import org.osgi.framework.BundleContext
-import org.apache.clerezza.osgi.services.ServicesDsl
-import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider
-
-/**
- * The classical Hello World root resource
- */
-@Path("hello-world")
-class HelloWorld(context: BundleContext) {
-  val servicesDsl = new ServicesDsl(context)
-  import servicesDsl._
-  @GET def get() = {
-    val resultMGraph = new SimpleMGraph();
-    val graphNode = new GraphNode(new BNode(), resultMGraph);
-    graphNode.addProperty(RDF.`type` , Ontology.HelloWordMessageType);
-    val cgp: ContentGraphProvider = $[ContentGraphProvider]
-    graphNode.addPropertyValue(DC.description,"Hello world of "+cgp.getContentGraph.size);
-    graphNode;
-
-  }
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/scala/HelloWorldMessageRenderlet.scala
----------------------------------------------------------------------
diff --git a/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/scala/HelloWorldMessageRenderlet.scala b/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/scala/HelloWorldMessageRenderlet.scala
deleted file mode 100644
index 6e41732..0000000
--- a/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/scala/HelloWorldMessageRenderlet.scala
+++ /dev/null
@@ -1,56 +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 skeleton
-
-import javax.ws.rs.core.MediaType
-import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.rdf.core.UriRef
-import org.apache.clerezza.rdf.utils.GraphNode
-import org.apache.clerezza.rdf.ontologies._
-import org.apache.clerezza.rdf.core._
-import org.apache.clerezza.rdf.utils._
-import org.apache.clerezza.rdf.scala.utils.Preamble._
-import org.apache.clerezza.platform.typerendering.scala._
-import org.apache.clerezza.rdf.ontologies.DC
-
-/**
- * A Renderlet for HelloWorldMessage
- */
-class HelloWorldMessageRenderlet extends SRenderlet {
-
-  val getRdfType = Ontology.HelloWordMessageType
-
-  override def getModePattern = "naked"
-
-  override def renderedPage(arguments: XmlResult.Arguments) = {
-    new XmlResult(arguments) {
-      override def content = {
-        resultDocModifier.addStyleSheet("/styles/hello-world/style.css")
-        <div xmlns="http://www.w3.org/1999/xhtml" id="tx-content">
-          <h2>A Message</h2>
-          <div class="message">{res/DC.description*}</div>
-        </div>
-      }
-    }
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/scala/Ontology.scala
----------------------------------------------------------------------
diff --git a/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/scala/Ontology.scala b/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/scala/Ontology.scala
deleted file mode 100644
index c831e8e..0000000
--- a/bundledevtool/src/main/resources/org/apache/clerezza/bundledevtool/skeletons/scala_with_activator/src/main/scala/Ontology.scala
+++ /dev/null
@@ -1,33 +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 skeleton
-
-import org.apache.clerezza.rdf.core.UriRef
-
-object Ontology {
-
-  /**
-   * The uri for the RDF type of HelloWordMessage
-   */
-  val HelloWordMessageType = new UriRef("http://example.org/skeleton#HelloWordMessage")
-
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/BundleRoot.scala
----------------------------------------------------------------------
diff --git a/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/BundleRoot.scala b/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/BundleRoot.scala
deleted file mode 100644
index 51cb6f8..0000000
--- a/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/BundleRoot.scala
+++ /dev/null
@@ -1,308 +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.bundledevtool
-
-
-import scala.actors.DaemonActor
-import scala.io._
-import org.osgi.framework.Bundle
-import org.osgi.framework.BundleContext
-import sbt._
-import scala.actors.Actor
-import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles._
-import org.ops4j.pax.swissbox.tinybundles.core.TinyBundle
-import org.apache.clerezza.scala.scripting.CompilerService
-import org.osgi.framework.Constants
-import org.osgi.service.component.ComponentContext
-import org.slf4j.LoggerFactory
-import scala.collection.mutable
-import org.osgi.service.packageadmin.PackageAdmin
-import tools.nsc.io.{AbstractFile, VirtualDirectory}
-import java.io.{File, FileInputStream, ByteArrayInputStream}
-import org.apache.clerezza.utils.osgi.BundlePathNode
-import org.wymiwyg.commons.util.dirbrowser.{PathNode, FilePathNode}
-
-/**
- * Provides a service that allows to register directories containing a maven-style project
- * structure to be registered as SourceBundle which is added as OSGi Bundle and regenerated
- * whenever a file is changed.
- *
- * Currently only scala files are compiled.
- */
-class BundleRoot {
-
-  private var compilerService: CompilerService = null
-  private var packageAdmin: PackageAdmin = null
-
-  private var bundleContext: BundleContext = null
-
-  private val skeletonsPath = "org/apache/clerezza/bundledevtool/skeletons"
-
-  val sourceBundles = mutable.ListBuffer[SourceBundle]()
-
-  protected def activate(c: ComponentContext) {
-    this.bundleContext = c.getBundleContext
-    sourceBundles.clear()
-    for (bundle <- bundleContext.getBundles) {
-      val location = bundle.getLocation
-      if (location.startsWith(BundleRoot.sourceBundleUriPrefix)) {
-        val dir = new File(location.substring(
-            BundleRoot.sourceBundleUriPrefix.length))
-        //TODO encode fileFastUpdate in location
-        val sourceBundle = new SourceBundle(dir, bundle, true)
-        sourceBundle.start()
-        sourceBundles += sourceBundle
-      }
-    }
-  }
-
-  protected def deactivate(c: ComponentContext) {
-    for (sb <- sourceBundles) sb.stop()
-  }
-
-  /**
-   * adds a SourceBundle for the sources in the specified dir
-   */
-  def addSourceBundle(dir: File, fileFastUpdate: Boolean) = {
-    val sourceBundle = new SourceBundle(dir, fileFastUpdate)
-    sourceBundle.start()
-    sourceBundles += sourceBundle
-    sourceBundle
-  }
-
-
-  /**
-  * list of the available skletons
-  */
-  def availableSkeletons: Seq[Symbol] = {
-    val skeletonsNode = new BundlePathNode(bundleContext.getBundle, skeletonsPath)
-    for (name <- skeletonsNode.list) yield {
-      Symbol(name.substring(1,name.length-1))
-    }
-  }
-
-  /**
-   * Creates and adds a new SourceBundle from a skeleton, no existing file is
-   * replaced
-   */
-  def createSourceBundle(skeleton: Symbol, dir: File) = {
-    dir.mkdirs
-    val skeletonsNode = new BundlePathNode(bundleContext.getBundle, skeletonsPath)
-    val skeletonNode = skeletonsNode.getSubPath(skeleton.name)
-    if (!skeletonNode.exists) {
-      throw new UnavailableSkeletonException(skeleton, availableSkeletons)
-    }
-    def processFile(p: PathNode, f: File) {
-      if (!f.exists) {
-        val in = scala.io.Source.fromInputStream(p.getInputStream)
-        val out = new java.io.PrintWriter(f)
-        try { in.getLines().foreach(out.println(_)) }
-        finally { out.close }
-      }
-    }
-    def processDir(p: PathNode, f: File) {
-      f.mkdir()
-      for (subPathString <- p.list()) {
-        val subPathNode: PathNode = p.getSubPath(subPathString)
-        val subFile: File = new File(f, subPathString)
-        if (subPathNode.isDirectory) {
-          processDir(subPathNode, subFile)
-        } else {
-          processFile(subPathNode, subFile)
-        }
-      }
-    }
-
-    processDir(skeletonNode, dir)
-    addSourceBundle(dir, true)
-  }
-
-  def bindCompilerService(cs: CompilerService) {
-    compilerService = cs;
-  }
-
-  def unbindCompilerService(cs: CompilerService) {
-    compilerService = null;
-  }
-
-  def bindPackageAdmin(pa: PackageAdmin) {
-    packageAdmin = pa
-  }
-
-  def unbindPackageAdmin(pa: PackageAdmin) {
-    packageAdmin = null
-  }
-
-  class SourceBundle(dir: File, existingBundle: Bundle, fileFastUpdate: Boolean) extends DaemonActor {
-
-    def this(dir: File, fileFastUpdate: Boolean) {
-      this(dir, null, fileFastUpdate)
-    }
-
-    var stopped = false
-    var logger = LoggerFactory.getLogger(classOf[SourceBundle])
-
-    val sourcePath = Path.fromFile(new File(dir,"src"))
-    var watchState = WatchState.empty
-    var bundle: Bundle = existingBundle
-    if (fileFastUpdate) {
-      val pathNode = new PermissionGrantingPathNode(new FilePathNode(new File(dir,"src/main/resources/CLEREZZA-INF/web-resources/")))
-      val registration = bundleContext.registerService(Array(classOf[PathNode].getName), pathNode, null: java.util.Dictionary[String, _])
-      //println("registered "+classOf[PathNode].getName+": "+registration)
-    }
-    
-    def getFilesAsCharArrays(file: File): List[Array[Char]] = {
-      logger.debug("getting sources in "+file)
-      var result: List[Array[Char]] = Nil
-      if (file.isDirectory) {
-        val children = file.listFiles
-        import scala.collection.JavaConversions._
-        for(child <- children) {
-          if (!child.getName.startsWith(".")) {
-            result = getFilesAsCharArrays(child) ::: result
-          }
-        }
-      } else {
-        if (file.getName.endsWith(".scala")) {
-          val in = Source.fromFile(file, "utf-8")
-          val stream = in.toStream
-          result = stream.toArray :: result
-        } 
-      }
-      result
-    }
-
-    private[this] def updateBundle() {
-      logger.info("updating source bundle with root "+dir)
-
-      val tinyBundle: TinyBundle = newBundle()
-
-      def compileDir(sourceDir: File): Option[String] = {
-
-        val charArrays = getFilesAsCharArrays(sourceDir)
-        logger.debug("compiling "+charArrays.size+" files")
-
-        val vdPathPrefix = "(memory)"
-        val virtualDirectory = new VirtualDirectory(vdPathPrefix, None)
-        //val wrappedDirectory = VirtualDirectoryWrapper.wrap(virtualDirectory, outputListener)
-
-        val writtenClasses = compilerService.compileToDir(charArrays, virtualDirectory)
-        logger.debug("virtualDirectory "+virtualDirectory.size)
-        var potentialActivator: Option[String] = None
-        for (writtenClass <- writtenClasses) {
-          val fullPath = writtenClass.path
-          val path = fullPath.substring(vdPathPrefix.length+1)
-          if (path.endsWith("Activator.class")) {
-            potentialActivator = Some(path.substring(0, path.lastIndexOf('.')).replace('/', '.'))
-          }
-          tinyBundle.add(path, new ByteArrayInputStream(writtenClass.toByteArray))
-        }
-        potentialActivator
-      }
-
-      def copyResource(resourcesDir: File) {
-        def copyResource(resourcesDir: File, prefix: String) {
-          val children = resourcesDir.listFiles
-          import scala.collection.JavaConversions._
-          for(child <- children) {
-            val childName = child.getName
-            if (!childName.startsWith(".")) {
-              if (child.isDirectory) {
-                copyResource(child, prefix+childName+"/")
-              } else {
-                tinyBundle.add(prefix+childName, new FileInputStream(child))
-              }
-            }
-          }
-        }
-        copyResource(resourcesDir, "")
-      }
-
-      val symName = dir.getPath.substring(1).replace(File.separatorChar, '.')
-
-      tinyBundle.set("Bundle-SymbolicName", symName)
-
-      val scalaSourceDir = new File(dir, "src/main/scala")
-
-      val potentialActivator = if (scalaSourceDir.exists) {
-        compileDir(scalaSourceDir)
-      } else {
-        logger.debug("No source dir "+scalaSourceDir)
-        None
-      }
-      val resourcesDir = new File(dir, "src/main/resources")
-      if (resourcesDir.exists) {
-        copyResource(resourcesDir)
-      } else {
-        logger.debug("No resources dir "+resourcesDir)
-      }
-      val serviceComponentsFile = new File(resourcesDir, "OSGI-INF/serviceComponents.xml")
-      if (serviceComponentsFile.exists) {
-        tinyBundle.set("Service-Component", "OSGI-INF/serviceComponents.xml")
-        tinyBundle.set(Constants.EXPORT_PACKAGE, "!OSGI-INF, *" )
-      }
-      potentialActivator match {
-        case Some(s) =>  tinyBundle.set("Bundle-Activator", s)
-        case _ => ;
-      }
-      tinyBundle.set(Constants.IMPORT_PACKAGE, "*" );
-      val in = tinyBundle.build(
-          withBnd()
-        )
-
-
-      if (bundle == null) {
-        bundle = bundleContext.installBundle(BundleRoot.sourceBundleUriPrefix+dir.toString, in)
-        bundle.start()
-      } else {
-        bundle.update(in)
-      }
-
-    }
-
-    def act() {
-      while (!stopped) {
-        logger.debug("wathcing "+dir)
-        val (triggered, newWatchState) =
-          SourceModificationWatch.watch(sourcePath**(-HiddenFileFilter), 1, watchState)(stopped)
-        logger.debug("watching got "+triggered+", "+newWatchState)
-        if (!stopped) {
-          try {
-            updateBundle()
-          } catch {
-            case e => logger.warn("Exception compiling", e)
-          }
-          watchState = newWatchState
-        }
-      }
-    }
-
-    def stop() {
-      stopped = true
-    }
-  }
-}
-
-
-object BundleRoot {
-
-  val sourceBundleUriPrefix = "bundledevtool:"
-
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/DevDsl.scala
----------------------------------------------------------------------
diff --git a/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/DevDsl.scala b/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/DevDsl.scala
deleted file mode 100644
index f69eef7..0000000
--- a/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/DevDsl.scala
+++ /dev/null
@@ -1,93 +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.bundledevtool
-
-import java.io.File
-import java.io.OutputStream
-import java.io.OutputStreamWriter
-import java.io.PrintWriter
-import org.osgi.framework.BundleContext
-import org.apache.clerezza.osgi.services.ServicesDsl
-
-class DevDsl(outputStream: OutputStream, bundleContext: BundleContext) {
-
-  sealed class FastUpdateMode;
-  
-  var fastUpdate = new FastUpdateMode;
-  var noFastUpdate = new FastUpdateMode();
-  
-  case class LocationSpec(location: String, fastUpdateMode: FastUpdateMode) {
-    def this(location: String) {
-      this(location, fastUpdate)
-    }
-  }
-  
-  implicit def locationSpecBuilder(location: String) = new LocationSpec(location)
-  
-  object Dev {
-    private val serviceDsl = new ServicesDsl(bundleContext)
-    import serviceDsl._
-    private lazy val out = new PrintWriter(new OutputStreamWriter(outputStream, "utf-8"), true)
-
-    def listArchetypes() {
-      out println "The following archetypes are available"
-      for (a <- $[BundleRoot].availableSkeletons) {
-        out println "  - "+a
-      }
-    }
-    
-    def create(archetype: Symbol) = new Object() {
-      def in(location: String): Unit = try {
-        $[BundleRoot].createSourceBundle(archetype, new File(location))
-      } catch {
-        case u: UnavailableSkeletonException => {
-          out println "FAILURE: no archetype "+archetype+" is available"
-          listArchetypes()
-        }
-      }
-    }
-
-    def load(locationSpec: LocationSpec) {
-      val dir = new File(locationSpec.location)
-      if (!dir.isDirectory) {
-        out println "No directory "+locationSpec.location+" found"
-      } else {
-        $[BundleRoot].addSourceBundle(dir, locationSpec.fastUpdateMode == fastUpdate)
-      }
-    }
-    
-    def help() {
-      out println "The Dev utitly can be used as follows:"
-      out println "Dev listArchetypes"
-      out println "\tlists the available archetypes"
-      out println "Dev create <archetype-name> in \"/path/to/directory\""
-      out println "\tCreates a new project in /path/to/directory using the specified archetype"
-      out println "Dev load \"/path/to/directory\""
-      out println "\tLoads the project in /path/to/directory"
-      out println "Dev load \"/path/to/directory\""
-      out println "\tLoads the project in /path/to/directory enabling fast-updating of static files"
-      out println "Dev load LocationSpec(\"/path/to/directory\",fastUpdate|noFastUpdate)"
-      out println "\tLoads the project in /path/to/directory enabling or diabling fast-updating of static files"
-    }
-    
-    override def toString = "Run 'Dev help' for usage instructions"
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/DevShellCustomizer.scala
----------------------------------------------------------------------
diff --git a/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/DevShellCustomizer.scala b/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/DevShellCustomizer.scala
deleted file mode 100644
index 2acaa8c..0000000
--- a/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/DevShellCustomizer.scala
+++ /dev/null
@@ -1,30 +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.bundledevtool
-
-import org.apache.clerezza.shell.Shell
-import org.apache.clerezza.shell.ShellCustomizer
-
-class DevShellCustomizer extends ShellCustomizer {
-  def bindings(e: Shell.Environment): List[(String, String, Any)] = {
-    List(("devDsl", classOf[DevDsl].getName, new DevDsl(e.out,
-            e.componentContext.getBundleContext)))
-  }
-  def imports: List[String] = List("devDsl._")
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/PermissionGrantingPathNode.scala
----------------------------------------------------------------------
diff --git a/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/PermissionGrantingPathNode.scala b/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/PermissionGrantingPathNode.scala
deleted file mode 100644
index aaaab91..0000000
--- a/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/PermissionGrantingPathNode.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.apache.clerezza.bundledevtool
-
-import org.wymiwyg.commons.util.dirbrowser.PathNode
-import java.security.AccessController
-import java.security.PrivilegedAction
-
-class PermissionGrantingPathNode(wrapped: PathNode) extends PathNode {
-
-  def doPrivileged[T](m: => T): T = {
-     AccessController.doPrivileged(new PrivilegedAction[T] {
-    def run: T = {
-      m
-    }
-  })
-  }
-  
-  def exists(): Boolean = doPrivileged(wrapped.exists())
-  def getLastModified(): java.util.Date = doPrivileged(wrapped.getLastModified())
-  def getPath(): String = doPrivileged(wrapped.getPath())
-  def getLength(): Long = doPrivileged(wrapped.getLength())
-  def getInputStream(): java.io.InputStream = doPrivileged(wrapped.getInputStream())
-  def list(): Array[String] = doPrivileged(wrapped.list())
-  def list(filter: org.wymiwyg.commons.util.dirbrowser.PathNameFilter): Array[String] = doPrivileged(wrapped.list(filter))
-  def isDirectory(): Boolean = doPrivileged(wrapped.isDirectory())
-  def getSubPath(subPath: String): PathNode = doPrivileged(new PermissionGrantingPathNode(wrapped.getSubPath(subPath)))
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/UnavailableSkeletonException.scala
----------------------------------------------------------------------
diff --git a/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/UnavailableSkeletonException.scala b/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/UnavailableSkeletonException.scala
deleted file mode 100644
index 5cb86e1..0000000
--- a/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/UnavailableSkeletonException.scala
+++ /dev/null
@@ -1,25 +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.bundledevtool
-
-class UnavailableSkeletonException(val requested: Symbol, val available: Seq[Symbol])
-  extends RuntimeException("The Skeleton "+requested.name+" is not avialble") {
-
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/bundledevtool/src/main/scala/sbt/ErrorHandling.scala
----------------------------------------------------------------------
diff --git a/bundledevtool/src/main/scala/sbt/ErrorHandling.scala b/bundledevtool/src/main/scala/sbt/ErrorHandling.scala
deleted file mode 100644
index ff31430..0000000
--- a/bundledevtool/src/main/scala/sbt/ErrorHandling.scala
+++ /dev/null
@@ -1,49 +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.
- *
-*/
-
-/* sbt -- Simple Build Tool
- * Copyright 2009  Mark Harrah
- */
-package sbt
-
-object ErrorHandling
-{
-  def translate[T](msg: => String)(f: => T) =
-    try { f }
-    catch { case e: Exception => throw new TranslatedException(msg + e.toString, e) }
-
-  def wideConvert[T](f: => T): Either[Throwable, T] =
-    try { Right(f) }
-    catch
-    {
-      case ex @ (_: Exception | _: StackOverflowError) => Left(ex)
-      case err @ (_: ThreadDeath | _: VirtualMachineError) => throw err
-      case x => Left(x)
-    }
-
-  def convert[T](f: => T): Either[Exception, T] =
-    try { Right(f) }
-    catch { case e: Exception => Left(e) }
-}
-final class TranslatedException private[sbt](msg: String, cause: Throwable) extends RuntimeException(msg, cause)
-{
-  override def toString = msg
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/bundledevtool/src/main/scala/sbt/io/Hash.scala
----------------------------------------------------------------------
diff --git a/bundledevtool/src/main/scala/sbt/io/Hash.scala b/bundledevtool/src/main/scala/sbt/io/Hash.scala
deleted file mode 100644
index 59aa5a3..0000000
--- a/bundledevtool/src/main/scala/sbt/io/Hash.scala
+++ /dev/null
@@ -1,97 +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.
- *
-*/
-
-/* sbt -- Simple Build Tool
- * Copyright 2009 Mark Harrah
- */
-package sbt
-
-import java.io.{ByteArrayInputStream, File, InputStream}
-
-object Hash
-{
-  private val BufferSize = 8192
-  def toHex(bytes: Array[Byte]): String =
-  {
-    val buffer = new StringBuilder(bytes.length * 2)
-    for(i <- 0 until bytes.length)
-    {
-      val b = bytes(i)
-      val bi: Int = if(b < 0) b + 256 else b
-      buffer append toHex((bi >>> 4).asInstanceOf[Byte])
-      buffer append toHex((bi & 0x0F).asInstanceOf[Byte])
-    }
-    buffer.toString
-  }
-  def fromHex(hex: String): Array[Byte] =
-  {
-    require((hex.length & 1) == 0, "Hex string must have length 2n.")
-    val array = new Array[Byte](hex.length >> 1)
-    for(i <- 0 until hex.length by 2)
-    {
-      val c1 = hex.charAt(i)
-      val c2 = hex.charAt(i+1)
-      array(i >> 1) = ((fromHex(c1) << 4) | fromHex(c2)).asInstanceOf[Byte]
-    }
-    array
-  }
-  /** Calculates the SHA-1 hash of the given String.*/
-  def apply(s: String): Array[Byte] = apply(new ByteArrayInputStream(s.getBytes("UTF-8")))
-  /** Calculates the SHA-1 hash of the given file.*/
-  def apply(file: File): Array[Byte] = Using.fileInputStream(file)(apply)
-  /** Calculates the SHA-1 hash of the given stream, closing it when finished.*/
-  def apply(stream: InputStream): Array[Byte] =
-  {
-    import java.security.{MessageDigest, DigestInputStream}
-    val digest = MessageDigest.getInstance("SHA")
-    try
-    {
-      val dis = new DigestInputStream(stream, digest)
-      val buffer = new Array[Byte](BufferSize)
-      while(dis.read(buffer) >= 0) {}
-      dis.close()
-      digest.digest
-    }
-    finally { stream.close() }
-  }
-
-  private def toHex(b: Byte): Char =
-  {
-    require(b >= 0 && b <= 15, "Byte " + b + " was not between 0 and 15")
-    if(b < 10)
-      ('0'.asInstanceOf[Int] + b).asInstanceOf[Char]
-    else
-      ('a'.asInstanceOf[Int] + (b-10)).asInstanceOf[Char]
-  }
-  private def fromHex(c: Char): Int =
-  {
-    val b =
-      if(c >= '0' && c <= '9')
-        (c - '0')
-      else if(c >= 'a' && c <= 'f')
-        (c - 'a') + 10
-      else if(c >= 'A' && c <= 'F')
-        (c - 'A') + 10
-      else
-        throw new RuntimeException("Invalid hex character: '" + c + "'.")
-    b
-  }
-}


Mime
View raw message