resolved confdb conflict

Author: xeraph

detector/kraken-arpwatch/src/main/java/org/krakenapps/arpwatch/impl/ArpEventSource.java

@@ -1,4 +1,19 @@
-package org.krakenapps.arpwatch.impl;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.arpwatch.impl;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

detector/kraken-arpwatch/src/main/java/org/krakenapps/arpwatch/impl/ArpSpoofEventImpl.java

@@ -1,4 +1,19 @@
-package org.krakenapps.arpwatch.impl;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.arpwatch.impl;
 
 import java.net.InetAddress;
 import java.util.Date;

detector/kraken-fluxmon/src/main/java/org/krakenapps/fluxmon/FluxRpcService.java

@@ -1,4 +1,19 @@
-package org.krakenapps.fluxmon;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.fluxmon;
 
 public interface FluxRpcService {
 }

detector/kraken-fluxmon/src/main/java/org/krakenapps/fluxmon/impl/FluxCountryStat.java

@@ -1,4 +1,19 @@
-package org.krakenapps.fluxmon.impl;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.fluxmon.impl;
 
 class FluxCountryStat implements Comparable<FluxCountryStat> {
 	private String name;

detector/kraken-fluxmon/src/main/java/org/krakenapps/fluxmon/impl/FluxRpcServiceImpl.java

@@ -1,4 +1,19 @@
-package org.krakenapps.fluxmon.impl;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.fluxmon.impl;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;

detector/kraken-fluxmon/src/main/java/org/krakenapps/fluxmon/impl/FluxStatistics.java

@@ -1,4 +1,19 @@
-package org.krakenapps.fluxmon.impl;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.fluxmon.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;

detector/kraken-maldomain/src/main/java/org/krakenapps/malwaredomains/MalwareDomain.java

@@ -1,4 +1,19 @@
-package org.krakenapps.malwaredomains;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.malwaredomains;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

detector/kraken-maldomain/src/main/java/org/krakenapps/malwaredomains/MalwareDomainService.java

@@ -1,4 +1,19 @@
-package org.krakenapps.malwaredomains;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.malwaredomains;
 
 import java.io.File;
 import java.io.IOException;

detector/kraken-maldomain/src/main/java/org/krakenapps/malwaredomains/impl/DefaultMalwareDomainService.java

@@ -1,4 +1,19 @@
-package org.krakenapps.malwaredomains.impl;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.malwaredomains.impl;
 
 import java.io.File;
 import java.io.FileInputStream;

detector/kraken-maldomain/src/main/java/org/krakenapps/malwaredomains/impl/MalwareDomainScript.java

@@ -1,4 +1,19 @@
-package org.krakenapps.malwaredomains.impl;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.malwaredomains.impl;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

detector/kraken-maldomain/src/main/java/org/krakenapps/malwaredomains/impl/MalwareDomainScriptFactory.java

@@ -1,4 +1,19 @@
-package org.krakenapps.malwaredomains.impl;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.malwaredomains.impl;
 
 import org.apache.felix.ipojo.annotations.Component;
 import org.apache.felix.ipojo.annotations.Provides;

detector/kraken-safebrowsing/src/main/java/org/krakenapps/safebrowsing/google/GoogleSafeBrowsing.java

@@ -1,4 +1,19 @@
-package org.krakenapps.safebrowsing.google;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.safebrowsing.google;
 
 import java.io.File;
 import java.io.FileWriter;

detector/kraken-safebrowsing/src/main/java/org/krakenapps/safebrowsing/google/GoogleSafeBrowsingConfiguration.java

@@ -1,4 +1,19 @@
-package org.krakenapps.safebrowsing.google;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.safebrowsing.google;
 
 import java.io.File;
 import java.io.FileInputStream;

detector/kraken-safebrowsing/src/main/java/org/krakenapps/safebrowsing/interfaces/SafeBrowsing.java

@@ -1,4 +1,19 @@
-package org.krakenapps.safebrowsing.interfaces;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.safebrowsing.interfaces;
 
 public interface SafeBrowsing {
 	void start();

detector/kraken-safebrowsing/src/main/java/org/krakenapps/safebrowsing/interfaces/SafeBrowsingConfiguration.java

@@ -1,4 +1,19 @@
-package org.krakenapps.safebrowsing.interfaces;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.safebrowsing.interfaces;
 
 public interface SafeBrowsingConfiguration {
 

detector/kraken-safebrowsing/src/main/java/org/krakenapps/safebrowsing/util/MD5Hasher.java

@@ -1,4 +1,19 @@
-package org.krakenapps.safebrowsing.util;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.safebrowsing.util;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

detector/kraken-sonar/src/main/java/org/krakenapps/sonar/Metabase.java

@@ -1,4 +1,19 @@
-package org.krakenapps.sonar;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.sonar;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;

detector/kraken-sonar/src/main/java/org/krakenapps/sonar/PassiveScanner.java

@@ -1,4 +1,19 @@
-package org.krakenapps.sonar;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.sonar;
 
 import java.util.Collection;
 

detector/kraken-sonar/src/main/java/org/krakenapps/sonar/SonarApi.java

@@ -1,4 +1,19 @@
-package org.krakenapps.sonar;
+/*
+ * Copyright 2010 NCHOVY
+ * 
+ * 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.
+ */
+ package org.krakenapps.sonar;
 
 public interface SonarApi {