Author: linsun
Date: Tue Dec 1 15:20:34 2009
New Revision: 885788
URL: http://svn.apache.org/viewvc?rev=885788&view=rev
Log:
ARIES-58 Move the com.ibm.osgi.util project from the initial ibm contribution
to aries trunk
Added:
incubator/aries/trunk/util/
incubator/aries/trunk/util/src/
incubator/aries/trunk/util/src/main/
incubator/aries/trunk/util/src/main/java/
incubator/aries/trunk/util/src/main/java/org/
incubator/aries/trunk/util/src/main/java/org/apache/
incubator/aries/trunk/util/src/main/java/org/apache/aries/
incubator/aries/trunk/util/src/main/java/org/apache/aries/util/
incubator/aries/trunk/util/src/main/java/org/apache/aries/util/FragmentBuilder.java
- copied, changed from r820758,
incubator/aries/contrib/ibm/com.ibm.osgi.utils/src/com/ibm/osgi/util/FragmentBuilder.java
incubator/aries/trunk/util/src/test/
incubator/aries/trunk/util/src/test/java/
incubator/aries/trunk/util/src/test/java/org/
incubator/aries/trunk/util/src/test/java/org/apache/
incubator/aries/trunk/util/src/test/java/org/apache/aries/
incubator/aries/trunk/util/src/test/java/org/apache/aries/util/
incubator/aries/trunk/util/src/test/java/org/apache/aries/util/FragmentUtilsTest.java
- copied, changed from r820758,
incubator/aries/contrib/ibm/com.ibm.osgi.utils/unittest/com/ibm/osgi/util/FragmentUtilsTest.java
Copied:
incubator/aries/trunk/util/src/main/java/org/apache/aries/util/FragmentBuilder.java
(from r820758,
incubator/aries/contrib/ibm/com.ibm.osgi.utils/src/com/ibm/osgi/util/FragmentBuilder.java)
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/util/src/main/java/org/apache/aries/util/FragmentBuilder.java?p2=incubator/aries/trunk/util/src/main/java/org/apache/aries/util/FragmentBuilder.java&p1=incubator/aries/contrib/ibm/com.ibm.osgi.utils/src/com/ibm/osgi/util/FragmentBuilder.java&r1=820758&r2=885788&rev=885788&view=diff
==============================================================================
---
incubator/aries/contrib/ibm/com.ibm.osgi.utils/src/com/ibm/osgi/util/FragmentBuilder.java
(original)
+++
incubator/aries/trunk/util/src/main/java/org/apache/aries/util/FragmentBuilder.java
Tue Dec 1 15:20:34 2009
@@ -1,7 +1,22 @@
-/*
- * (C) Copyright IBM Corp. 2009
+/**
+ * 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 com.ibm.osgi.util;
+package org.apache.aries.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Copied:
incubator/aries/trunk/util/src/test/java/org/apache/aries/util/FragmentUtilsTest.java
(from r820758,
incubator/aries/contrib/ibm/com.ibm.osgi.utils/unittest/com/ibm/osgi/util/FragmentUtilsTest.java)
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/util/src/test/java/org/apache/aries/util/FragmentUtilsTest.java?p2=incubator/aries/trunk/util/src/test/java/org/apache/aries/util/FragmentUtilsTest.java&p1=incubator/aries/contrib/ibm/com.ibm.osgi.utils/unittest/com/ibm/osgi/util/FragmentUtilsTest.java&r1=820758&r2=885788&rev=885788&view=diff
==============================================================================
---
incubator/aries/contrib/ibm/com.ibm.osgi.utils/unittest/com/ibm/osgi/util/FragmentUtilsTest.java
(original)
+++
incubator/aries/trunk/util/src/test/java/org/apache/aries/util/FragmentUtilsTest.java
Tue Dec 1 15:20:34 2009
@@ -1,7 +1,22 @@
-/*
- * (C) Copyright IBM Corp. 2009
+/**
+ * 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 com.ibm.osgi.util;
+package org.apache.aries.util;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -10,7 +25,7 @@
import java.util.Dictionary;
import java.util.Hashtable;
-import mocks.BundleMock;
+import org.apache.aries.mocks.BundleMock;
import org.junit.Before;
import org.junit.Test;
@@ -18,9 +33,9 @@
import org.osgi.framework.Constants;
import org.osgi.framework.Version;
-import com.ibm.aries.unittest.mocks.MethodCall;
-import com.ibm.aries.unittest.mocks.Skeleton;
-import com.ibm.osgi.util.FragmentBuilder;
+import org.apache.aries.unittest.mocks.MethodCall;
+import org.apache.aries.unittest.mocks.Skeleton;
+import org.apache.aries.util.FragmentBuilder;
public class FragmentUtilsTest {
