Author: reto
Date: Thu May 24 17:34:18 2012
New Revision: 1342352
URL: http://svn.apache.org/viewvc?rev=1342352&view=rev
Log:
added svn:ignore
Modified:
incubator/clerezza/trunk/parent/bundledevtool/ (props changed)
incubator/clerezza/trunk/parent/bundledevtool/pom.xml
incubator/clerezza/trunk/parent/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/
(props changed)
incubator/clerezza/trunk/parent/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/BundleRoot.scala
incubator/clerezza/trunk/parent/clerezza-jar-resource-bundle/ (props
changed)
incubator/clerezza/trunk/parent/scala-scripting/script-engine/ (props
changed)
incubator/clerezza/trunk/parent/scala-scripting/tests/ (props changed)
incubator/clerezza/trunk/parent/slf4j-scala-api/ (props changed)
incubator/clerezza/trunk/parent/utils.imagemagick/ (props changed)
Propchange: incubator/clerezza/trunk/parent/bundledevtool/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu May 24 17:34:18 2012
@@ -5,5 +5,5 @@ target
.project
.externalToolBuilders
.settings
-
*.iml
+.cache
Modified: incubator/clerezza/trunk/parent/bundledevtool/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/bundledevtool/pom.xml?rev=1342352&r1=1342351&r2=1342352&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/bundledevtool/pom.xml (original)
+++ incubator/clerezza/trunk/parent/bundledevtool/pom.xml Thu May 24 17:34:18
2012
@@ -49,10 +49,6 @@
<artifactId>scala-library</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
-
<artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
- <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
@@ -77,6 +73,16 @@
<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>
Propchange:
incubator/clerezza/trunk/parent/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu May 24 17:34:18 2012
@@ -0,0 +1 @@
+PermissionGrantingPathNode.scala
Modified:
incubator/clerezza/trunk/parent/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/BundleRoot.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/BundleRoot.scala?rev=1342352&r1=1342351&r2=1342352&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/BundleRoot.scala
(original)
+++
incubator/clerezza/trunk/parent/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/BundleRoot.scala
Thu May 24 17:34:18 2012
@@ -37,7 +37,7 @@ import org.osgi.service.packageadmin.Pac
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
+import org.wymiwyg.commons.util.dirbrowser.{PathNode, FilePathNode}
/**
* Provides a service that allows to register directories containing a
maven-style project
@@ -160,9 +160,13 @@ class BundleRoot {
var stopped = false
var logger = LoggerFactory.getLogger(classOf[SourceBundle])
- val sourcePath = Path.fromFile(dir)
+ val sourcePath = Path.fromFile(new File(dir,"src"))
var watchState = WatchState.empty
var bundle: Bundle = existingBundle
+
+ 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[_, _])
+ println("registered "+classOf[PathNode].getName+":
"+registration)
def getFilesAsCharArrays(file: File): List[Array[Char]] = {
logger.debug("getting sources in "+file)
@@ -278,6 +282,7 @@ class BundleRoot {
logger.debug("wathcing "+dir)
val (triggered, newWatchState) =
SourceModificationWatch.watch(sourcePath**(-HiddenFileFilter), 1,
watchState)(stopped)
+ logger.debug("watching got "+triggered+",
"+newWatchState)
if (!stopped) {
try {
updateBundle()
Propchange: incubator/clerezza/trunk/parent/clerezza-jar-resource-bundle/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu May 24 17:34:18 2012
@@ -1,3 +1,5 @@
+maven-eclipse.xml
+.externalToolBuilders
.settings
target
.classpath
Propchange: incubator/clerezza/trunk/parent/scala-scripting/script-engine/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu May 24 17:34:18 2012
@@ -1,3 +1,4 @@
+.settings
script-engine.iml
target
.classpath
Propchange: incubator/clerezza/trunk/parent/scala-scripting/tests/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu May 24 17:34:18 2012
@@ -1,3 +1,4 @@
+.settings
tests.iml
target
.project
Propchange: incubator/clerezza/trunk/parent/slf4j-scala-api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu May 24 17:34:18 2012
@@ -1,3 +1,5 @@
+maven-eclipse.xml
+.externalToolBuilders
slf4j-scala-api.iml
target
.scala_dependencies
Propchange: incubator/clerezza/trunk/parent/utils.imagemagick/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu May 24 17:34:18 2012
@@ -1,2 +1,3 @@
+.settings
.project
target
