Permalink
Browse files

Finalized release

  • Loading branch information...
christianbauer committed Nov 5, 2014
1 parent fa7efc5 commit 5fd60eb9e2e87f2ae6d1cf049145c4187040518c
View
@@ -24,14 +24,16 @@ git clone https://github.com/4thline/cling.git
mvn clean install
````
+If your build fails with Android/dex packaging errors, you forgot the clean.
+
* Use Cling in your pom.xml with:
````
<dependencies>
<dependency>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-core</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</dependency>
</dependencies>
````
View
@@ -7,7 +7,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<name>Cling Core</name>
@@ -82,6 +82,7 @@
<!-- Website lifecycle -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
<configuration>
<reportPlugins>
<!-- THESE IGNORE GLOBAL PLUGIN MANAGEMENT! -->
@@ -97,6 +98,16 @@
</reports>
</reportSet>
</reportSets>
+ <configuration>
+ <!-- The directories containing Java (test) sources for citation -->
+ <sourceDirectories>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <sourceDirectory>src/test/java</sourceDirectory>
+ <sourceDirectory>../demo/android/browser/src/android</sourceDirectory>
+ <sourceDirectory>../demo/android/browser/src/main/java</sourceDirectory>
+ <sourceDirectory>../demo/android/light/src/main/java</sourceDirectory>
+ </sourceDirectories>
+ </configuration>
</plugin>
<!-- Javadoc on the website -->
@@ -37,7 +37,7 @@
* If no {@link UpnpServiceConfiguration} is provided it will automatically
* instantiate {@link DefaultUpnpServiceConfiguration}. This configuration <strong>does not
* work</strong> on Android! Use the {@link org.fourthline.cling.android.AndroidUpnpService}
- * application component instead
+ * application component instead.
* </p>
* <p>
* Override the various <tt>create...()</tt> methods to customize instantiation of protocol factory,
@@ -44,7 +44,7 @@
* client and server. The servlet context path for UPnP is set to <code>/upnp</code>.
* </p>
* <p>
- * The kxml2 implementation of <code>org.xmlpull</code> is available Android, therefore
+ * The kxml2 implementation of <code>org.xmlpull</code> is available on Android, therefore
* this configuration uses {@link RecoveringUDA10DeviceDescriptorBinderImpl},
* {@link RecoveringSOAPActionProcessorImpl}, and {@link RecoveringGENAEventProcessorImpl}.
* </p>
@@ -224,7 +224,9 @@ public boolean isRoot() {
}
protected D find(UDN udn, D current) {
- if (current.getIdentity().getUdn().equals(udn)) return current;
+ if (current.getIdentity() != null && current.getIdentity().getUdn() != null) {
+ if (current.getIdentity().getUdn().equals(udn)) return current;
+ }
if (current.hasEmbeddedDevices()) {
for (D embeddedDevice : (D[]) current.getEmbeddedDevices()) {
D match;
@@ -236,9 +238,9 @@ protected D find(UDN udn, D current) {
protected Collection<D> findEmbeddedDevices(D current) {
Collection<D> devices = new HashSet();
- if (!current.isRoot()) {
+ if (!current.isRoot() && current.getIdentity().getUdn() != null)
devices.add(current);
- }
+
if (current.hasEmbeddedDevices()) {
for (D embeddedDevice : (D[]) current.getEmbeddedDevices()) {
devices.addAll(findEmbeddedDevices(embeddedDevice));
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-core</artifactId>
- <version>2.0</version>
+ <version>2.0.0</version>
</dependency>
</dependencies>]]></pre>
@@ -15,10 +15,6 @@ handlers=org.seamless.util.logging.SystemOutLoggingHandler
#org.fourthline.cling.transport.spi.DatagramProcessor.level=INFO
#org.fourthline.cling.transport.spi.MulticastReceiver.level=INFO
-# Apps
-#org.fourthline.cling.bridge.level=FINER
-#org.fourthline.cling.workbench.bridge.level=FINER
-
# Always keep this as WARNING with Workbench etc. apps, we
# have an endless loop in how we log/intercept CDI beans...
org.jboss.weld.Bean.level=WARNING
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-demo-android</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<name>Cling Demo Android Browser</name>
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-demo-android</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<name>Cling Demo Android Light</name>
View
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-demo</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<name>Cling Demo Android</name>
View
@@ -7,7 +7,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<name>Cling Demo</name>
@@ -31,6 +31,13 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
View
@@ -7,7 +7,7 @@
<parent>
<artifactId>cling</artifactId>
<groupId>org.fourthline.cling</groupId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<name>Cling Distribution</name>
@@ -23,6 +23,13 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
<!-- Package a "legacy" distribution ZIP file -->
<plugin>
@@ -42,42 +42,43 @@ Add this dependency to your pom.xml:
<version>${project.version}</version>
</dependency>
-The current unstable version is 2.0-SNAPSHOT.
-
For Cling on Android with Maven, please see the pom.xml example in the
demo/android/ folder.
==============================================================================
BUILDING CLING
==============================================================================
-To build the source of 2.0-SNAPSHOT, clone it with:
-
- git clone https://github.com/4thline/cling.git'
-
-Run "mvn install" to build the JAR files and store them in your local repo.
+See https://github.com/4thline/cling
==============================================================================
DEPENDENCIES
==============================================================================
Required dependencies of Cling Core (included with this distribution):
- +- org.fourthline.cling:cling-core:jar:2.0-SNAPSHOT
- +- org.seamless:seamless-util:jar:1.0-alpha3
- +- org.seamless:seamless-http:jar:1.0-alpha3
- \- org.seamless:seamless-xml:jar:1.0-alpha3
+ +- org.fourthline.cling:cling-core:jar:2.0.0
+ +- org.seamless:seamless-util:jar:1.0.0
+ +- org.seamless:seamless-http:jar:1.0.0
+ \- org.seamless:seamless-xml:jar:1.0.0
Additional dependencies of Cling Core on Android (not included):
- TODO
- jetty
+ +- org.eclipse.jetty:jetty-server:jar:8.1.8.v20121106
+ | +- org.eclipse.jetty.orbit:javax.servlet:jar:3.0.0.v201112011016
+ | +- org.eclipse.jetty:jetty-continuation:jar:8.1.8.v20121106
+ | \- org.eclipse.jetty:jetty-http:jar:8.1.8.v20121106
+ | \- org.eclipse.jetty:jetty-io:jar:8.1.8.v20121106
+ | \- org.eclipse.jetty:jetty-util:jar:8.1.8.v20121106
+ +- org.eclipse.jetty:jetty-servlet:jar:8.1.8.v20121106
+ | \- org.eclipse.jetty:jetty-security:jar:8.1.8.v20121106
+ +- org.eclipse.jetty:jetty-client:jar:8.1.8.v20121106
+- org.slf4j:slf4j-jdk14:jar:1.6.1 (or any other SLF4J implementation)
\- org.slf4j:slf4j-api:jar:1.6.1
If you need the fixed Android java.util.logging Handler:
- +- org.seamless:seamless-android:jar:1.0-alpha3
+ +- org.seamless:seamless-android:jar:1.0.0
\- android.support:compatibility-v13:jar:10 (Exclude this in pom.xml)
WARNING: Jetty JAR files each contain an 'about.html' file, you will get
@@ -89,7 +90,7 @@ JAR files and remove 'about.html'.
Feedback, bug reports: http://4thline.org/projects/mailinglists.html
-Copyright 2013, 4th Line GmbH, Switzerland, http://4thline.com/
+Copyright 2014, 4th Line GmbH, Switzerland, http://4thline.com/
You may at your option receive a license to this program under EITHER
the terms of the GNU Lesser General Public License (LGPL) OR the
View
@@ -7,7 +7,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<name>Cling MediaRenderer</name>
@@ -55,6 +55,7 @@
<!-- Website lifecycle -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
<configuration>
<reportPlugins>
<!-- THESE IGNORE GLOBAL PLUGIN MANAGEMENT! -->
@@ -36,10 +36,10 @@
</p>
<p>
- Note: The OS X version will look for GStreamer libraries in <code>/opt/local/lib</code> (default location for MacPorts install),
- the <em>JAR</em> version requires that you specify the location of your gstreamer install as a system property (e.g. on Linux):
- <code>java -Djna.library.path=/usr/lib -jar cling-mediarenderer.jar</code>
+ Note: Specify the location of your gstreamer install as a system property (e.g. on Linux):
</p>
+ <pre>
+java -Djna.library.path=/usr/lib -jar cling-mediarenderer.jar</pre>
<p>
If you want to run the MediaRenderer's display in windowed mode (not fullscreen), start it with the <code>-w</code> argument.
@@ -51,10 +51,7 @@
<ul>
<li>
- <a href="http://www.4thline.org/m2/org/fourthline/cling/cling-mediarenderer/1.0.5/cling-mediarenderer-1.0.5.dmg">Mac OS X desktop application (Snow Leopard required)</a>
- </li>
- <li>
- <a href="http://www.4thline.org/m2/org/fourthline/cling/cling-mediarenderer/1.0.5/cling-mediarenderer-1.0.5-standalone.jar">JDK 1.6 desktop application (any OS)</a>
+ <a href="http://www.4thline.org/m2/org/fourthline/cling/cling-mediarenderer/2.0.0/cling-mediarenderer-2.0.0-standalone.jar">JDK 1.6 desktop application (any OS)</a>
</li>
<li>
<a href="http://www.4thline.org/projects/download/">Cling main distribution (incl. Cling Core library)</a>
View
47 pom.xml
@@ -4,12 +4,25 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!-- ##################################################################################################### -->
+ <!--
+
+ BUILD NOTES
+
+ Build only the manual of core (or other module), in root pom.xml's current directory (output in ./target/manual/)
+
+ mvn -N clean org.fourthline.lemma:lemma-maven-plugin:manual \
+ -Dmanual.templateFilename=cling-core-manual.xhtml \
+ -Dmanual.manualSourceDirectory=core/src/manual \
+ -Dmanual.testSourceDirectory=core/src/test
+
+ -->
<!-- ##################################################################################################### -->
<groupId>org.fourthline.cling</groupId>
<artifactId>cling</artifactId>
<packaging>pom</packaging>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<modules>
<module>core</module>
@@ -67,8 +80,8 @@
<maven.compiler.source>6</maven.compiler.source>
<maven.compiler.target>6</maven.compiler.target>
- <seamless.version>1.0-alpha3</seamless.version>
- <lemma.version>1.1-SNAPSHOT</lemma.version>
+ <seamless.version>1.0.0</seamless.version>
+ <lemma.version>1.1.0</lemma.version>
<testng.version>6.2</testng.version>
<apache.httpcomponents.httpclient.version>4.2.2</apache.httpcomponents.httpclient.version>
<apache.httpcomponents.httpcore.version>4.2.3</apache.httpcomponents.httpcore.version>
@@ -94,7 +107,7 @@
<id>4thline-repo</id>
<url>http://4thline.org/m2</url>
<snapshots>
- <enabled>true</enabled>
+ <enabled>false</enabled>
</snapshots>
</repository>
<repository>
@@ -111,7 +124,7 @@
<id>4thline-repo</id>
<url>http://4thline.org/m2</url>
<snapshots>
- <enabled>true</enabled>
+ <enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
@@ -191,16 +204,10 @@
<version>2.4.1</version>
</plugin>
- <!-- WAR bundle for bridge -->
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1</version>
- </plugin>
-
<!-- Website lifecycle -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0-beta-3</version>
+ <version>3.3</version>
<dependencies>
<!-- We have raw XHTML files -->
<dependency>
@@ -218,13 +225,6 @@
<version>1.4.4</version>
</plugin>
- <!-- OS X executable -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>osxappbundle-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
- </plugin>
-
<!-- Manual generation settings -->
<plugin>
<groupId>org.fourthline.lemma</groupId>
@@ -302,13 +302,4 @@
<!-- ##################################################################################################### -->
- <!--
- Build only the core (or other module) manual, parent pom.xml's current directory (output in ./target/manual/)
-
- mvn -N clean org.fourthline.lemma:lemma-maven-plugin:manual \
- -Dmanual.templateFilename=cling-core-manual.xhtml \
- -Dmanual.manualSourceDirectory=core/src/manual \
- -Dmanual.testSourceDirectory=core/src/test
- -->
-
</project>
Oops, something went wrong.

0 comments on commit 5fd60eb

Please sign in to comment.