Fixed javadocs.

Change-Id: Ie72449f277aa458d51e66a77c8e2c8c6f6edc2fb

@@ -64,10 +64,8 @@ public class DefaultGroupHandler {
     protected LinkService linkService;
     protected FlowObjectiveService flowObjectiveService;
 
-    protected HashMap<DeviceId, Set<PortNumber>> devicePortMap =
-            new HashMap<DeviceId, Set<PortNumber>>();
-    protected HashMap<PortNumber, DeviceId> portDeviceMap =
-            new HashMap<PortNumber, DeviceId>();
+    protected HashMap<DeviceId, Set<PortNumber>> devicePortMap = new HashMap<>();
+    protected HashMap<PortNumber, DeviceId> portDeviceMap = new HashMap<>();
     //protected HashMap<NeighborSet, Integer> deviceNextObjectiveIds =
     //        new HashMap<NeighborSet, Integer>();
     protected EventuallyConsistentMap<
@@ -113,6 +111,7 @@ public class DefaultGroupHandler {
      * @param config interface to retrieve the device properties
      * @param linkService link service object
      * @param flowObjService flow objective service object
+     * @param nsNextObjStore next objective store map
      * @return default group handler type
      */
     public static DefaultGroupHandler createGroupHandler(DeviceId deviceId,
@@ -120,8 +119,7 @@ public class DefaultGroupHandler {
                                                          DeviceProperties config,
                                                          LinkService linkService,
                                                          FlowObjectiveService flowObjService,
-                                                         EventuallyConsistentMap<
-                                                         NeighborSetNextObjectiveStoreKey,
+                                                         EventuallyConsistentMap<NeighborSetNextObjectiveStoreKey,
                                                                  Integer> nsNextObjStore) {
         if (config.isEdgeDevice(deviceId)) {
             return new DefaultEdgeGroupHandler(deviceId, appId, config,

@@ -54,14 +54,14 @@ public class PolicyGroupHandler extends DefaultGroupHandler {
      * @param config interface to retrieve the device properties
      * @param linkService link service object
      * @param flowObjService flow objective service object
+     * @param nsNextObjStore next objective store map
      */
     public PolicyGroupHandler(DeviceId deviceId,
                               ApplicationId appId,
                               DeviceProperties config,
                               LinkService linkService,
                               FlowObjectiveService flowObjService,
-                              EventuallyConsistentMap<
-                              NeighborSetNextObjectiveStoreKey,
+                              EventuallyConsistentMap<NeighborSetNextObjectiveStoreKey,
                                       Integer> nsNextObjStore) {
         super(deviceId, appId, config, linkService, flowObjService, nsNextObjStore);
     }

+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * 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
+ *
+ * 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.
+ */
+
+/**
+ * XOS integration application CLI commands.
+ */
+package org.onosproject.xosintegration.cli;
\ No newline at end of file

@@ -15,7 +15,6 @@
  */
 
 /**
- * Test Application that calls a REST API. One dat it might call XOS to
- * launch a VM.
+ * XOS integration application which relies on XOS REST APIs to manage VMs.
  */
 package org.onosproject.xosintegration;

+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * 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
+ *
+ * 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.
+ */
+
+/**
+ * Base abstractions and utilities for developing REST APIs.
+ */
+package org.onosproject.rest;
\ No newline at end of file

@@ -56,7 +56,7 @@
                         <group>
                             <title>Network Model &amp; Services</title>
                             <packages>
-                                org.onosproject:org.onosproject.*
+                                org.onosproject:org.onosproject.*:org.onosproject.rest
                             </packages>
                         </group>
                         <group>

@@ -55,7 +55,7 @@
                         <group>
                             <title>Network Model &amp; Services</title>
                             <packages>
-                                org.onosproject:org.onosproject.*
+                                org.onosproject:org.onosproject.*:org.onosproject.rest
                             </packages>
                         </group>
                         <group>
@@ -115,7 +115,7 @@
                         <group>
                             <title>GUI, REST &amp; Command-Line</title>
                             <packages>
-                                org.onosproject.ui.impl:org.onosproject.rest:org.onosproject.cli:org.onosproject.rest.*:org.onosproject.cli.*:org.onosproject.codec.impl
+                                org.onosproject.ui.impl*:org.onosproject.rest*:org.onosproject.cli:org.onosproject.rest.*:org.onosproject.cli.*:org.onosproject.codec.impl
                             </packages>
                         </group>
                         <group>

+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * 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
+ *
+ * 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.
+ */
+
+/**
+ * Base abstractions and utilities for creating topology view overlays; experimental.
+ */
+package org.onosproject.ui.impl.topo.overlay;
\ No newline at end of file

+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * 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
+ *
+ * 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.
+ */
+
+/**
+ * Topology view server-side model service with ability for apps to overlay
+ * their own functionality and information; experimental.
+ */
+package org.onosproject.ui.impl.topo;
\ No newline at end of file