Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some changes. #3

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open

Some changes. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f7edd5f
Dedicated class for Scala source files.
Mar 15, 2012
1158077
Including OSGi BundleContext in ScalaSource. Need to refactor tests.
Mar 16, 2012
7833e02
Putting compile() and archive() methods in ScalaSource.
Mar 16, 2012
dcd558d
Removing ScalaTransformer.
Mar 16, 2012
0b867d0
Cleaning up implementation of bundles.
Mar 16, 2012
62f446b
AbstractFile interface is of no use to rewrite Scala code.
Mar 19, 2012
0ef2527
Cleaning up.
Mar 19, 2012
827e6a2
Stubbed out PlainFile in favor of AbstractFile. Unit tests fail.
Mar 19, 2012
62b28b6
SizeOption is overriden. Unit tests are OK.
Mar 19, 2012
cf74249
Trying to hook in parsing of manifest in comments.
Mar 21, 2012
e177e08
Better parsing of Scala scripts.
Mar 21, 2012
0870287
Able to extract manifest when parsing.
Mar 21, 2012
0b55283
Cleaning up printlns.
Mar 21, 2012
68c62a3
Small tweaks.
Mar 23, 2012
7de7954
Using StoreReporter instead of a custom AbstractReporter.
Mar 23, 2012
93fd742
Trying to implement failing bundles for failed compilation.
Mar 23, 2012
67744c2
Able to provide a failing bundle when compilation fails.
Mar 23, 2012
2462b89
Safer generation of bundles.
Mar 26, 2012
0f1ac8e
Review: essentially simple refactorings
Mar 27, 2012
92430e4
Refactoring, and adding an exception reporting mechanism to embedded …
Mar 27, 2012
11d2483
Silencing tracing of AbstractFileClassLoader.
Mar 27, 2012
afc3a4a
Fixing logging statements and other stack traces.
Mar 27, 2012
5f9cb74
Fixing logging levels.
Mar 27, 2012
349808d
Fixing compiler verbosity.
Mar 27, 2012
d92f5e6
Review
Mar 27, 2012
9158174
Removing manifest parsing, as it is not robust enough yet.
Mar 27, 2012
c52a425
Able to print stack trace of parser combinators in infinite loop now.
Mar 27, 2012
bfc33d1
Nicolas' change to Slang code for XTech codebase:
Apr 11, 2012
4bb0efa
Version typo.
Apr 18, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ webgen.cache
*.i??
.idea
*.swp
atlassian-ide-plugin.xml
218 changes: 108 additions & 110 deletions features/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,122 +1,120 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">
<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/xsd/maven-4.0.0.xsd">

<!--
Copyright (C) FuseSource, Inc.
http://fusesource.com
<!--
Copyright (C) FuseSource, Inc.
http://fusesource.com

Copyright (C) Crossing-Tech SA, 2012.
Contact: <[email protected]>
Copyright (C) Crossing-Tech SA, 2012.
Contact: <[email protected]>

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
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
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.
-->
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.
-->

<parent>
<artifactId>parent</artifactId>
<groupId>org.fusesource.slang</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>parent</artifactId>
<groupId>org.fusesource.slang</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>features</artifactId>
<name>Slang :: Features</name>
<modelVersion>4.0.0</modelVersion>

<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<artifactId>features</artifactId>
<name>Slang :: Features</name>

<build>
<resources>
<resource>
<directory>${pom.basedir}/src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>features-maven-plugin</artifactId>
<version>${karaf.version}</version>
<executions>
<execution>
<id>validate</id>
<phase>process-resources</phase>
<goals>
<goal>validate</goal>
</goals>
<configuration>
<file>target/classes/features.xml</file>
<!--karafConfig>src/main/resources/config.properties</karafConfig-->
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.6.1</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>target/classes/features.xml</file>
<type>xml</type>
<classifier>features</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>${pom.basedir}/src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>features-maven-plugin</artifactId>
<version>${karaf.version}</version>
<executions>
<execution>
<id>validate</id>
<phase>process-resources</phase>
<goals>
<goal>validate</goal>
</goals>
<configuration>
<file>target/classes/features.xml</file>
<!--karafConfig>src/main/resources/config.properties</karafConfig-->
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.6.1</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>target/classes/features.xml</file>
<type>xml</type>
<classifier>features</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
Loading