felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From don...@apache.org
Subject svn commit: r554447 - in /felix/sandbox/donsez/upnp.devicegen.util: ./ src/main/java/org/apache/felix/upnp/devicegen/holder/ src/main/java/org/apache/felix/upnp/devicegen/util/ src/main/java/org/apache/felix/upnp/devicegen/uuid/
Date Sun, 08 Jul 2007 21:34:34 GMT
Author: donsez
Date: Sun Jul  8 14:34:33 2007
New Revision: 554447

URL: http://svn.apache.org/viewvc?view=rev&rev=554447
Log:
change the banner in java files
add a helper class for persistent UUID generation

Added:
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/uuid/
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/uuid/UUIDHelper.java   (with props)
Modified:
    felix/sandbox/donsez/upnp.devicegen.util/pom.xml
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/BooleanHolder.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/ByteArrayHolder.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/CharacterHolder.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/DateHolder.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/DoubleHolder.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/FloatHolder.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/IntegerHolder.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/LongHolder.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/StringHolder.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPAction.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPDevice.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPService.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPStateVariable.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/DeviceIcon.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/EventSource.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/Lookup.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPDataTypeUtil.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPEventListenerUtil.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPEventNotifier.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPStateVariableDescriptor.java
    felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPSubscriber.java

Modified: felix/sandbox/donsez/upnp.devicegen.util/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/pom.xml?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/pom.xml (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/pom.xml Sun Jul  8 14:34:33 2007
@@ -19,7 +19,7 @@
 <project>
 
 	<properties>
-		<repositoryLocation>http://www-adele.imag.fr/users/Didier.Donsez/dev/felix/sandbox/</repositoryLocation>
+		<repositoryLocation>http://www.apache.org/~donsez/dev/felix/</repositoryLocation>
 		<description>utility classes for the Felix UPnP Device Generator (org.apache.felix.upnp.devicegen).</description>
 	</properties>  
 
@@ -56,7 +56,12 @@
           
           	<!-- docs in http://cwiki.apache.org/FELIX/bundle-plugin-for-maven-bnd.html and http://cwiki.apache.org/FELIX/osgi-plugin-for-maven-2.html -->
           	
-            <Export-Package>org.apache.felix.upnp.devicegen.holder,org.apache.felix.upnp.devicegen.util</Export-Package>
+            <Export-Package>
+            	org.apache.felix.upnp.devicegen.holder,
+            	org.apache.felix.upnp.devicegen.util,
+            	org.apache.felix.upnp.devicegen.uuid
+           	</Export-Package>
+
             <Import-Package>*</Import-Package>
 
             <Bundle-DocURL>${repositoryLocation}${pom.artifactId}/index.html</Bundle-DocURL>

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/BooleanHolder.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/BooleanHolder.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/BooleanHolder.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/BooleanHolder.java Sun Jul  8 14:34:33 2007
@@ -1,11 +1,26 @@
 /*
-__LICENSE__
-*/
+ * 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.felix.upnp.devicegen.holder;
 
 /**
  * holder for out parameters 
- * @author Didier Donsez
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class BooleanHolder {
 	

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/ByteArrayHolder.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/ByteArrayHolder.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/ByteArrayHolder.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/ByteArrayHolder.java Sun Jul  8 14:34:33 2007
@@ -1,11 +1,26 @@
 /*
-__LICENSE__
-*/
+ * 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.felix.upnp.devicegen.holder;
 
 /**
  * holder for out parameters 
- * @author Didier Donsez
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class ByteArrayHolder {
 	

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/CharacterHolder.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/CharacterHolder.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/CharacterHolder.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/CharacterHolder.java Sun Jul  8 14:34:33 2007
@@ -1,11 +1,26 @@
 /*
-__LICENSE__
-*/
+ * 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.felix.upnp.devicegen.holder;
 
 /**
  * holder for out parameters 
- * @author Didier Donsez
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class CharacterHolder {
 	

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/DateHolder.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/DateHolder.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/DateHolder.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/DateHolder.java Sun Jul  8 14:34:33 2007
@@ -1,13 +1,28 @@
 /*
-__LICENSE__
-*/
+ * 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.felix.upnp.devicegen.holder;
 
 import java.util.Date;
 
 /**
  * holder for out parameters 
- * @author Didier Donsez
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class DateHolder {
 	

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/DoubleHolder.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/DoubleHolder.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/DoubleHolder.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/DoubleHolder.java Sun Jul  8 14:34:33 2007
@@ -1,12 +1,27 @@
 /*
-__LICENSE__
-*/
+ * 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.felix.upnp.devicegen.holder;
 
 
 /**
  * holder for out parameters 
- * @author Didier Donsez
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class DoubleHolder {
 	

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/FloatHolder.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/FloatHolder.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/FloatHolder.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/FloatHolder.java Sun Jul  8 14:34:33 2007
@@ -1,11 +1,26 @@
 /*
-__LICENSE__
-*/
+ * 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.felix.upnp.devicegen.holder;
 
 /**
  * holder for out parameters 
- * @author Didier Donsez
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class FloatHolder {
 	

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/IntegerHolder.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/IntegerHolder.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/IntegerHolder.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/IntegerHolder.java Sun Jul  8 14:34:33 2007
@@ -1,11 +1,26 @@
 /*
-__LICENSE__
-*/
+ * 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.felix.upnp.devicegen.holder;
 
 /**
  * holder for out parameters 
- * @author Didier Donsez
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class IntegerHolder {
 	

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/LongHolder.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/LongHolder.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/LongHolder.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/LongHolder.java Sun Jul  8 14:34:33 2007
@@ -1,11 +1,26 @@
 /*
-__LICENSE__
-*/
+ * 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.felix.upnp.devicegen.holder;
 
 /**
  * holder for out parameters 
- * @author Didier Donsez
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class LongHolder {
 	

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/StringHolder.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/StringHolder.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/StringHolder.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/holder/StringHolder.java Sun Jul  8 14:34:33 2007
@@ -1,11 +1,26 @@
 /*
-__LICENSE__
-*/
+ * 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.felix.upnp.devicegen.holder;
 
 /**
  * holder for out parameters 
- * @author Didier Donsez
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class StringHolder {
 	

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPAction.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPAction.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPAction.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPAction.java Sun Jul  8 14:34:33 2007
@@ -1,7 +1,21 @@
 /*
- * @author donsez
+ * 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.felix.upnp.devicegen.util;
 
 import java.util.Dictionary;
@@ -15,7 +29,7 @@
 import org.osgi.service.upnp.UPnPStateVariable;
 
 /*
- * @author donsez
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 
 public abstract class AbstractUPnPAction

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPDevice.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPDevice.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPDevice.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPDevice.java Sun Jul  8 14:34:33 2007
@@ -1,4 +1,20 @@
 /*
+ * 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.felix.upnp.devicegen.util;
 
@@ -21,7 +37,7 @@
 import org.osgi.service.upnp.UPnPService;
 
 /**
- * @author donsez
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public abstract class AbstractUPnPDevice implements BundleActivator, UPnPDevice {
 

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPService.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPService.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPService.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPService.java Sun Jul  8 14:34:33 2007
@@ -1,3 +1,21 @@
+/*
+ * 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.felix.upnp.devicegen.util;
 
 import java.util.Iterator;

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPStateVariable.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPStateVariable.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPStateVariable.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/AbstractUPnPStateVariable.java Sun Jul  8 14:34:33 2007
@@ -1,3 +1,21 @@
+/*
+ * 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.felix.upnp.devicegen.util;
 
 import org.osgi.framework.BundleActivator;
@@ -5,6 +23,9 @@
 import org.osgi.service.upnp.UPnPService;
 import org.osgi.service.upnp.UPnPStateVariable;
 
+/**
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
+ */
 public abstract class AbstractUPnPStateVariable
 	implements UPnPStateVariable, BundleActivator {
 

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/DeviceIcon.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/DeviceIcon.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/DeviceIcon.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/DeviceIcon.java Sun Jul  8 14:34:33 2007
@@ -1,6 +1,21 @@
 /*
-__LICENSE__
-*/
+ * 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.felix.upnp.devicegen.util;
 import java.io.IOException;
 import java.io.InputStream;

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/EventSource.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/EventSource.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/EventSource.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/EventSource.java Sun Jul  8 14:34:33 2007
@@ -1,31 +1,27 @@
 /*
-DomoWare OSGi UPnP Sample TV Device is an implementation of UPnP Device service to be used with OSGi Framework
-Copyright (C) 2004  Matteo Demuru, Francesco Furfari, Stefano "Kismet" Lenzi
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-You can contact us at:
-	{matte-d, sygent, kismet-sl} [at] users.sourceforge.net
-*/
+ * 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.felix.upnp.devicegen.util;
 
 import java.beans.PropertyChangeListener;
 
 /**
- * EventSource.java 8-feb-2005
- * @author Francesco Furfari
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public interface EventSource {
 	void addPropertyChangeListener(PropertyChangeListener listener);

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/Lookup.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/Lookup.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/Lookup.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/Lookup.java Sun Jul  8 14:34:33 2007
@@ -1,24 +1,21 @@
 /*
-DomoWare UPnP Base Driver is an implementation of the OSGi UnP Device Specifaction
-Copyright (C) 2005 Matteo Demuru, Francesco Furfari, Stefano "Kismet" Lenzi
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-You can contact us at:
-	{matte-d, sygent, kismet-sl} [at] users.sourceforge.net
-*/
+ * 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.felix.upnp.devicegen.util;
 
@@ -31,8 +28,7 @@
 import org.osgi.service.upnp.UPnPService;
 
 /**
- * Lookup.java 8-feb-2005
- * @author Francesco Furfari
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class Lookup {
     

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPDataTypeUtil.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPDataTypeUtil.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPDataTypeUtil.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPDataTypeUtil.java Sun Jul  8 14:34:33 2007
@@ -1,5 +1,20 @@
 /*
- * __LICENSE__ 
+ * 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.felix.upnp.devicegen.util;
 
@@ -11,7 +26,7 @@
 
 /**
  * utility class to obtains java class for UPnP data type
- * @author donsez
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class UPnPDataTypeUtil {
 

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPEventListenerUtil.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPEventListenerUtil.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPEventListenerUtil.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPEventListenerUtil.java Sun Jul  8 14:34:33 2007
@@ -1,5 +1,20 @@
 /*
- * __LICENSE__
+ * 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.felix.upnp.devicegen.util;
 
@@ -10,7 +25,7 @@
 import org.osgi.service.upnp.UPnPStateVariable;
 
 /**
- * @author donsez
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class UPnPEventListenerUtil {
 

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPEventNotifier.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPEventNotifier.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPEventNotifier.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPEventNotifier.java Sun Jul  8 14:34:33 2007
@@ -1,24 +1,21 @@
 /*
-DomoWare OSGi UPnP Sample TV Device is an implementation of UPnP Device service to be used with OSGi Framework
-Copyright (C) 2004  Matteo Demuru, Francesco Furfari, Stefano "Kismet" Lenzi
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-You can contact us at:
-	{matte-d, sygent, kismet-sl} [at] users.sourceforge.net
-*/
+ * 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.felix.upnp.devicegen.util;
 
 import java.beans.PropertyChangeEvent;
@@ -40,8 +37,7 @@
 import org.osgi.service.upnp.UPnPStateVariable;
 
 /**
- * UPnPEventNotifier.java 8-feb-2005
- * @author Francesco Furfari
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class UPnPEventNotifier implements PropertyChangeListener,ServiceListener {
 	BundleContext context;

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPStateVariableDescriptor.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPStateVariableDescriptor.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPStateVariableDescriptor.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPStateVariableDescriptor.java Sun Jul  8 14:34:33 2007
@@ -1,32 +1,27 @@
 /*
-DomoWare UPnP Base Driver is an implementation of the OSGi UnP Device Specifaction
-Copyright (C) 2005 Matteo Demuru, Francesco Furfari, Stefano "Kismet" Lenzi
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-You can contact us at:
-	{matte-d, sygent, kismet-sl} [at] users.sourceforge.net
-*/
-
+ * 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.felix.upnp.devicegen.util;
 
 import org.osgi.service.upnp.UPnPStateVariable;
 
 /**
- * UPnPStateVariableDescriptor.java 22-gen-2005
- * @author Francesco Furfari
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public interface UPnPStateVariableDescriptor extends UPnPStateVariable {
     Object getValue();

Modified: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPSubscriber.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPSubscriber.java?view=diff&rev=554447&r1=554446&r2=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPSubscriber.java (original)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/util/UPnPSubscriber.java Sun Jul  8 14:34:33 2007
@@ -1,24 +1,21 @@
 /*
-DomoWare OSGi UPnP Sample TV Device is an implementation of UPnP Device service to be used with OSGi Framework
-Copyright (C) 2004  Matteo Demuru, Francesco Furfari, Stefano "Kismet" Lenzi
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-You can contact us at:
-	{matte-d, sygent, kismet-sl} [at] users.sourceforge.net
-*/
+ * 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.felix.upnp.devicegen.util;
 
 import java.util.Dictionary;
@@ -35,8 +32,7 @@
 import org.osgi.service.upnp.UPnPService;
 
 /**
- * UPnPSubscriber.java 8-feb-2005
- * @author Francesco Furfari
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class UPnPSubscriber {
 	private BundleContext context;

Added: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/uuid/UUIDHelper.java
URL: http://svn.apache.org/viewvc/felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/uuid/UUIDHelper.java?view=auto&rev=554447
==============================================================================
--- felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/uuid/UUIDHelper.java (added)
+++ felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/uuid/UUIDHelper.java Sun Jul  8 14:34:33 2007
@@ -0,0 +1,102 @@
+/*
+ * 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.felix.upnp.devicegen.uuid;
+
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.security.SecureRandom;
+import java.text.MessageFormat;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+
+/**
+ * This helper generates persistent UUID for UPnP device
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
+ */
+public class UUIDHelper {
+
+	private static SecureRandom secureRandom; // lazy instanciation
+	private static Object forSync=new Object();
+
+	/**
+	 * format of the uuid
+	 * {0} is the IP address
+	 * {1} is the timestamp
+	 * {2} is a secure (so unique) 64 bits number
+	 * {3} is the bundle symbolic name
+	 */
+	//static MessageFormat messageFormat=new MessageFormat("uuid:{3}-{2}");
+	private static MessageFormat messageFormat=new MessageFormat("uuid:{3}-{2}@{1}");
+	//static MessageFormat messageFormat=new MessageFormat("uuid:{0}-{1}-{2}");
+	
+	public static String getUUID(BundleContext bundleContext, boolean persistent){
+		
+		String uuid=null;
+		
+		// read the bundle entry CONFIG-INF/uuid.txt
+		
+		if(persistent){
+			// else read uuid.txt in cache
+		}
+		
+		// else generate a uuid
+		if(secureRandom==null){ // lazy instanciation
+			synchronized (forSync) {
+				if(secureRandom==null){
+					secureRandom=new SecureRandom();
+				}				
+			}
+		}
+		
+		String ipaddress="";
+		try {
+			InetAddress inetAddress=null;
+			inetAddress=Inet4Address.getLocalHost();
+			if(inetAddress!=null) ipaddress=inetAddress.toString();
+		} catch (UnknownHostException e) {
+		}
+
+		Object[] params=new Object[]{
+				ipaddress,
+				new Long(System.currentTimeMillis()),
+				new Long(secureRandom.nextLong()), // could by secureRandom.nextBytes(128 bits byte[])		
+				bundleContext.getBundle().getHeaders().get(Constants.BUNDLE_SYMBOLICNAME)		
+		};
+		
+		
+		
+		uuid=messageFormat.format(params);
+		
+		if(persistent){
+			
+			// save the generated uuid in CONFIG-INF/uuid.txt in the cache
+
+		}
+		
+		return uuid;
+	}
+	
+	
+	public static void resetUUID(BundleContext bundleContext){
+		// delete CONFIG-INF/uuid.txt in the cache
+		;
+	}
+}

Propchange: felix/sandbox/donsez/upnp.devicegen.util/src/main/java/org/apache/felix/upnp/devicegen/uuid/UUIDHelper.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message