Merge branch 'master' of github.com:cybergarage/CyberLink4Java

Conflicts: ChangeLog
leonzhuhi · Apr 9, 2012 · 00bc7d7 · 00bc7d7
2 parents e57d06f + 1e45ad9
commit 00bc7d7
Show file tree

Hide file tree

Showing 20 changed files with 212 additions and 0 deletions.
diff --git a/flash/pom.xml b/flash/pom.xml
@@ -20,14 +20,24 @@
   <licenses>
   	<license>
   		<name>BSD</name>
+<<<<<<< HEAD
   		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
+=======
+  		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   	</license>
   </licenses>
 
   <scm>
+<<<<<<< HEAD
   	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</connection>
   	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</developerConnection>
   	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/light</url>
+=======
+  	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</connection>
+  	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</developerConnection>
+  	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/light</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   </scm>
 
   <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -39,9 +39,15 @@
   </mailingLists>
 
   <scm>
+<<<<<<< HEAD
   	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/</connection>
   	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/</developerConnection>
   	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/</url>
+=======
+  	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/</connection>
+  	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/</developerConnection>
+  	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   </scm>
 
   <dependencyManagement>

diff --git a/proxy/upnp-proxy-gui/pom.xml b/proxy/upnp-proxy-gui/pom.xml
@@ -20,14 +20,24 @@
   <licenses>
   	<license>
   		<name>BSD</name>
+<<<<<<< HEAD
   		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
+=======
+  		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   	</license>
   </licenses>
 
   <scm>
+<<<<<<< HEAD
   	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</connection>
   	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</developerConnection>
   	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/light</url>
+=======
+  	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</connection>
+  	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</developerConnection>
+  	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/light</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   </scm>
 
   <dependencies>

diff --git a/proxy/upnp-proxy/pom.xml b/proxy/upnp-proxy/pom.xml
@@ -20,14 +20,24 @@
   <licenses>
   	<license>
   		<name>BSD</name>
+<<<<<<< HEAD
   		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
+=======
+  		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   	</license>
   </licenses>
 
   <scm>
+<<<<<<< HEAD
   	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</connection>
   	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</developerConnection>
   	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/light</url>
+=======
+  	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</connection>
+  	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</developerConnection>
+  	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/light</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   </scm>
 
   <dependencies>

diff --git a/proxy/upnp-sample-proxy/pom.xml b/proxy/upnp-sample-proxy/pom.xml
@@ -20,14 +20,24 @@
   <licenses>
   	<license>
   		<name>BSD</name>
+<<<<<<< HEAD
   		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
+=======
+  		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   	</license>
   </licenses>
 
   <scm>
+<<<<<<< HEAD
   	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</connection>
   	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</developerConnection>
   	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/light</url>
+=======
+  	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</connection>
+  	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</developerConnection>
+  	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/light</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   </scm>
 
   <dependencies>

diff --git a/rui/upnp-rui-player/pom.xml b/rui/upnp-rui-player/pom.xml
@@ -20,14 +20,24 @@
   <licenses>
   	<license>
   		<name>BSD</name>
+<<<<<<< HEAD
   		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
+=======
+  		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   	</license>
   </licenses>
 
   <scm>
+<<<<<<< HEAD
   	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</connection>
   	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</developerConnection>
   	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/light</url>
+=======
+  	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</connection>
+  	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</developerConnection>
+  	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/light</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   </scm>
 
   <dependencies>

diff --git a/rui/upnp-rui-server/pom.xml b/rui/upnp-rui-server/pom.xml
@@ -20,14 +20,24 @@
   <licenses>
   	<license>
   		<name>BSD</name>
+<<<<<<< HEAD
   		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
+=======
+  		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   	</license>
   </licenses>
 
   <scm>
+<<<<<<< HEAD
   	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</connection>
   	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</developerConnection>
   	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/light</url>
+=======
+  	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</connection>
+  	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</developerConnection>
+  	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/light</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   </scm>
 
   <dependencies>

diff --git a/rui/upnp-rui/pom.xml b/rui/upnp-rui/pom.xml
@@ -20,14 +20,24 @@
   <licenses>
   	<license>
   		<name>BSD</name>
+<<<<<<< HEAD
   		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
+=======
+  		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   	</license>
   </licenses>
 
   <scm>
+<<<<<<< HEAD
   	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</connection>
   	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</developerConnection>
   	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/light</url>
+=======
+  	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</connection>
+  	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</developerConnection>
+  	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/light</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   </scm>
 
   <dependencies>

diff --git a/samples/air-conditioner/pom.xml b/samples/air-conditioner/pom.xml
@@ -4,7 +4,10 @@
   <parent>
     <artifactId>cyberlink</artifactId>
     <groupId>org.cybergarage.cyberlink</groupId>
+<<<<<<< HEAD
     <relativePath>../../</relativePath>
+=======
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
     <version>2</version>
   </parent>
 
@@ -21,14 +24,24 @@
   <licenses>
   	<license>
   		<name>BSD</name>
+<<<<<<< HEAD
   		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
+=======
+  		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   	</license>
   </licenses>
 
   <scm>
+<<<<<<< HEAD
   	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/air-conditioner</connection>
   	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/air-conditioner</developerConnection>
   	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/air-conditioner</url>	
+=======
+  	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/air-conditioner</connection>
+  	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/air-conditioner</developerConnection>
+  	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/air-conditioner</url>	
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   </scm>
 
   <dependencies>

diff --git a/samples/clock/pom.xml b/samples/clock/pom.xml
@@ -4,7 +4,10 @@
   <parent>
     <artifactId>cyberlink</artifactId>
     <groupId>org.cybergarage.cyberlink</groupId>
+<<<<<<< HEAD
     <relativePath>../../</relativePath>
+=======
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
     <version>2</version>
   </parent>
 
@@ -21,14 +24,24 @@
   <licenses>
   	<license>
   		<name>BSD</name>
+<<<<<<< HEAD
   		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
+=======
+  		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   	</license>
   </licenses>
 
   <scm>
+<<<<<<< HEAD
   	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/clock</connection>
   	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/clock</developerConnection>
   	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/clock</url>
+=======
+  	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/clock</connection>
+  	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/clock</developerConnection>
+  	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/clock</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   </scm>
 
   <dependencies>

diff --git a/samples/light/pom.xml b/samples/light/pom.xml
@@ -4,7 +4,10 @@
   <parent>
     <artifactId>cyberlink</artifactId>
     <groupId>org.cybergarage.cyberlink</groupId>        
+<<<<<<< HEAD
     <relativePath>../../</relativePath>
+=======
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
     <version>2</version>    
   </parent>
 
@@ -21,14 +24,24 @@
   <licenses>
   	<license>
   		<name>BSD</name>
+<<<<<<< HEAD
   		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
+=======
+  		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   	</license>
   </licenses>
 
   <scm>
+<<<<<<< HEAD
   	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</connection>
   	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</developerConnection>
   	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/light</url>
+=======
+  	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</connection>
+  	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</developerConnection>
+  	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/light</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   </scm>
 
   <dependencies>

diff --git a/samples/pom.xml b/samples/pom.xml
@@ -18,9 +18,15 @@
   <description>A suite of samples using the CyberLink UPnP Stack</description>
 
   <scm>
+<<<<<<< HEAD
   	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/</connection>
   	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/</developerConnection>
   	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/</url>	
+=======
+  	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/</connection>
+  	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/</developerConnection>
+  	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/</url>	
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   </scm>
 
   <modules>

diff --git a/samples/remote-controller/pom.xml b/samples/remote-controller/pom.xml
@@ -4,7 +4,10 @@
   <parent>
     <artifactId>cyberlink</artifactId>
     <groupId>org.cybergarage.cyberlink</groupId>        
+<<<<<<< HEAD
     <relativePath>../../</relativePath>
+=======
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
     <version>2</version>    
   </parent>
 
@@ -21,14 +24,24 @@
   <licenses>
   	<license>
   		<name>BSD</name>
+<<<<<<< HEAD
   		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
+=======
+  		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   	</license>
   </licenses>
 
   <scm>
+<<<<<<< HEAD
   	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/remote-controller</connection>
   	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/remote-controller</developerConnection>
   	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/remote-controller</url>
+=======
+  	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/remote-controller</connection>
+  	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/remote-controller</developerConnection>
+  	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/remote-controller</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   </scm>
 
   <dependencies>

diff --git a/samples/tv/pom.xml b/samples/tv/pom.xml
@@ -4,7 +4,10 @@
   <parent>
     <artifactId>cyberlink</artifactId>
     <groupId>org.cybergarage.cyberlink</groupId>        
+<<<<<<< HEAD
     <relativePath>../../</relativePath>
+=======
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
     <version>2</version>    
   </parent>
 
@@ -21,14 +24,24 @@
   <licenses>
   	<license>
   		<name>BSD</name>
+<<<<<<< HEAD
   		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
+=======
+  		<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   	</license>
   </licenses>
 
   <scm>
+<<<<<<< HEAD
   	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/tv</connection>
   	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/tv</developerConnection>
   	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/tv</url>
+=======
+  	<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/tv</connection>
+  	<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/tv</developerConnection>
+  	<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/tv</url>
+>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
   </scm>
 
   <dependencies>