You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2016/01/25 19:42:35 UTC

[4/5] incubator-geode git commit: GEODE-803: Updating headers on WAN and CQ code

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
index 6d465f0..14affa6 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * 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.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
index 29ed0a4..56d8f77 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * 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.gemstone.gemfire.cache.query.cq.dunit;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
index b66228e..2109e24 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * 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.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
index b7eaaa2..fdb46c3 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * 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.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
index 47a3fe7..249f3da 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * 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.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
index 1a61233..9769ddd 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * 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.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
index 4948fe9..cd75e97 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * 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.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
index 1dbb1d7..a236909 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * 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.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
index a9a1ac8..4bbc5e7 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * 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.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
index 14c4f9d..c8e502f 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * 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.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
index 1e165c9..c890c87 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * 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.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
index 51a60d2..15a74ce 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * 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.gemstone.gemfire.cache.query.dunit;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
index de1ed89..7129f62 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
@@ -1,500 +1,500 @@
-/*
- * 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.gemstone.gemfire.cache.query.dunit;
-
-import java.io.IOException;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import com.gemstone.gemfire.LogWriter;
-import com.gemstone.gemfire.cache.AttributesFactory;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheException;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.PartitionAttributes;
-import com.gemstone.gemfire.cache.PartitionAttributesFactory;
-import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache.client.PoolFactory;
-import com.gemstone.gemfire.cache.client.PoolManager;
-import com.gemstone.gemfire.cache.query.CacheUtils;
-import com.gemstone.gemfire.cache.query.CqAttributes;
-import com.gemstone.gemfire.cache.query.CqEvent;
-import com.gemstone.gemfire.cache.query.CqListener;
-import com.gemstone.gemfire.cache.query.CqQuery;
-import com.gemstone.gemfire.cache.query.Query;
-import com.gemstone.gemfire.cache.query.QueryService;
-import com.gemstone.gemfire.cache.query.SelectResults;
-import com.gemstone.gemfire.cache.query.Struct;
-import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryTestListener;
-import com.gemstone.gemfire.cache.query.data.PortfolioPdx;
-import com.gemstone.gemfire.cache.query.data.PositionPdx;
-import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
-import com.gemstone.gemfire.cache30.CacheTestCase;
-import com.gemstone.gemfire.compression.Compressor;
-import com.gemstone.gemfire.compression.SnappyCompressor;
-import com.gemstone.gemfire.i18n.LogWriterI18n;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.pdx.PdxReader;
-import com.gemstone.gemfire.pdx.PdxSerializable;
-import com.gemstone.gemfire.pdx.PdxWriter;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
-
-public abstract class PdxQueryCQTestBase extends CacheTestCase {
-
-  /** The port on which the bridge server was started in this VM */
-  private static int bridgeServerPort;
-  protected static final Compressor compressor = SnappyCompressor.getDefaultInstance();
-  protected final String rootRegionName = "root";
-  protected final String regionName = "PdxTest";
-  protected final String regionName2 = "PdxTest2";
-  protected final String regName = "/" + rootRegionName + "/" + regionName;
-  protected final String regName2 = "/" + rootRegionName + "/" + regionName2;
-  protected final String[] queryString = new String[] {
-      "SELECT DISTINCT id FROM " + regName, // 0
-      "SELECT * FROM " + regName, // 1
-      "SELECT ticker FROM " + regName, // 2
-      "SELECT * FROM " + regName + " WHERE id > 5", // 3
-      "SELECT p FROM " + regName + " p, p.idTickers idTickers WHERE p.ticker = 'vmware'", // 4
-    };
-
-  private static int getCacheServerPort() {
-    return bridgeServerPort;
-  }
-
-  public void tearDown2() throws Exception {
-    disconnectAllFromDS(); // tests all expect to create a new ds
-    // Reset the testObject numinstance for the next test.
-    TestObject.numInstance = 0;
-    // In all VM.
-    resetTestObjectInstanceCount();    
-  }
-
-  private void resetTestObjectInstanceCount() {
-    final Host host = Host.getHost(0);
-    for (int i=0; i < 4; i++) {
-      VM vm = host.getVM(i);
-      vm.invoke(new CacheSerializableRunnable("Create Bridge Server") {
-        public void run2() throws CacheException {
-          TestObject.numInstance = 0;
-          PortfolioPdx.numInstance = 0;
-          PositionPdx.numInstance = 0;
-          PositionPdx.cnt = 0;
-          TestObject2.numInstance = 0;
-        }
-      });
-    }
-  }
-
-  public void createPool(VM vm, String poolName, String server, int port,
-      boolean subscriptionEnabled) {
-        createPool(vm, poolName, new String[]{server}, new int[]{port}, subscriptionEnabled);  
-      }
-
-  public void createPool(VM vm, String poolName, String server, int port) {
-    createPool(vm, poolName, new String[]{server}, new int[]{port}, false);  
-  }
-
-  public void createPool(VM vm, final String poolName, final String[] servers, final int[] ports,
-      final boolean subscriptionEnabled) {
-        createPool(vm, poolName, servers, ports, subscriptionEnabled, 0);    
-      }
-
-  public void createPool(VM vm, final String poolName, final String[] servers, final int[] ports,
-      final boolean subscriptionEnabled, final int redundancy) {
-        vm.invoke(new CacheSerializableRunnable("createPool :" + poolName) {
-          public void run2() throws CacheException {
-            // Create Cache.
-            Properties props = new Properties();
-            props.setProperty("mcast-port", "0");
-            props.setProperty("locators", "");
-            getSystem(props );
-            getCache();        
-            PoolFactory cpf = PoolManager.createFactory();
-            cpf.setSubscriptionEnabled(subscriptionEnabled);
-            cpf.setSubscriptionRedundancy(redundancy);
-            for (int i=0; i < servers.length; i++){
-              getLogWriter().info("### Adding to Pool. ### Server : " + servers[i] + " Port : " + ports[i]);
-              cpf.addServer(servers[i], ports[i]);
-            }
-            cpf.create(poolName);
-          }
-        });   
-      }
-
-  public void executeClientQueries(VM vm, final String poolName, final String queryStr) {
-    vm.invoke(new CacheSerializableRunnable("Execute queries") {
-      public void run2() throws CacheException {
-        SelectResults results = null;
-        Comparator comparator = null;
-        Object[] resultsArray = null;
-        QueryService remoteQueryService = null;
-        QueryService localQueryService = null;
-        SelectResults[][] rs = new SelectResults[1][2];
-        
-        try {
-          remoteQueryService = (PoolManager.find(poolName)).getQueryService();
-          localQueryService = getCache().getQueryService();
-        } catch (Exception e) {
-          fail("Failed to get QueryService.", e);
-        }          
-  
-        try {
-          getLogWriter().info("### Executing Query on server:" + queryStr);
-          Query query = remoteQueryService.newQuery(queryStr);
-          rs[0][0] = (SelectResults)query.execute();
-          //printResults (rs[0][0], " ### Remote Query Results : ####");
-          getLogWriter().info("### Executing Query locally:" + queryStr);
-          query = localQueryService.newQuery(queryStr);
-          rs[0][1] = (SelectResults)query.execute();
-          getLogWriter().info("### Remote Query rs size: " + (rs[0][0]).size() + 
-              "Local Query rs size: " + (rs[0][1]).size());
-          //printResults (rs[0][1], " ### Local Query Results : ####");
-          // Compare local and remote query results.
-          if (!CacheUtils.compareResultsOfWithAndWithoutIndex(rs))
-          {
-             fail("Local and Remote Query Results are not matching for query :" + queryStr);  
-          }
-        } catch (Exception e) {
-          fail("Failed executing " + queryStr, e);
-        }
-      }
-    });
-  }
-
-  public void printResults(SelectResults results, String message) {
-    Object r;
-    Struct s;
-    LogWriterI18n logger = GemFireCacheImpl.getInstance().getLoggerI18n();
-    logger.fine(message);
-    int row = 0;
-    for (Iterator iter = results.iterator(); iter.hasNext(); ) {
-      r = iter.next();
-      row++;
-      if (r instanceof Struct) {
-         s = (Struct)r;
-         String[] fieldNames = ((Struct)r).getStructType().getFieldNames();
-         for (int i=0; i < fieldNames.length; i++){
-            logger.fine("### Row " + row  + "\n" + "Field: " +
-                fieldNames[i] + " > " + s.get(fieldNames[i]).toString());
-         }
-      } else {
-        logger.fine("#### Row " + row + "\n" + r);
-      }
-    }
-  }
-
-  protected void configAndStartBridgeServer() {
-    configAndStartBridgeServer(false, false, false, null); 
-  }
-
-  protected void configAndStartBridgeServer(boolean isPr, boolean isAccessor) {
-    configAndStartBridgeServer(false, false, false, null); 
-  }
-
-  protected void configAndStartBridgeServer(boolean isPr, boolean isAccessor,
-      boolean asyncIndex, Compressor compressor) {
-        AttributesFactory factory = new AttributesFactory();
-        if (isPr) {
-          PartitionAttributesFactory paf = new PartitionAttributesFactory();
-          //factory.setDataPolicy(DataPolicy.PARTITION);
-          if (isAccessor){
-            paf.setLocalMaxMemory(0);
-          }
-          PartitionAttributes prAttr = paf.setTotalNumBuckets(20).setRedundantCopies(0).create();
-          factory.setPartitionAttributes(prAttr);
-        } else {
-          factory.setScope(Scope.DISTRIBUTED_ACK);
-          factory.setDataPolicy(DataPolicy.REPLICATE);      
-        }
-        if (asyncIndex) {
-          factory.setIndexMaintenanceSynchronous(!asyncIndex);
-        }
-        if (compressor != null) {
-          factory.setCompressor(compressor);
-        }
-        
-        createRegion(this.regionName, this.rootRegionName, factory.create());
-        createRegion(this.regionName2, this.rootRegionName, factory.create());
-        
-        try {
-          startBridgeServer(0, false);
-        } catch (Exception ex) {
-          fail("While starting CacheServer", ex);
-        }
-      }
-
-  protected void executeCompiledQueries(String poolName, Object[][] params) {
-    SelectResults results = null;
-    Comparator comparator = null;
-    Object[] resultsArray = null;
-    QueryService qService = null;
-  
-    try {
-      qService = (PoolManager.find(poolName)).getQueryService();
-    } catch (Exception e) {
-      fail("Failed to get QueryService.", e);
-    }          
-  
-    for (int i=0; i < queryString.length; i++){
-      try {
-        getLogWriter().info("### Executing Query :" + queryString[i]);
-        Query query = qService.newQuery(queryString[i]);
-        results = (SelectResults)query.execute(params[i]);
-      } catch (Exception e) {
-        fail("Failed executing " + queryString[i], e);
-      }
-    }        
-  }
-
-  /**
-   * Starts a bridge server on the given port, using the given
-   * deserializeValues and notifyBySubscription to serve up the
-   * given region.
-   */
-  protected void startBridgeServer(int port, boolean notifyBySubscription)
-      throws IOException {
-      
-        Cache cache = getCache();
-        CacheServer bridge = cache.addCacheServer();
-        bridge.setPort(port);
-        bridge.setNotifyBySubscription(notifyBySubscription);
-        bridge.start();
-        bridgeServerPort = bridge.getPort();
-      }
-
-  /**
-   * Stops the bridge server that serves up the given cache.
-   */
-  protected void stopBridgeServer(Cache cache) {
-    CacheServer bridge =
-      (CacheServer) cache.getCacheServers().iterator().next();
-    bridge.stop();
-    assertFalse(bridge.isRunning());
-  }
-
-  public void closeClient(VM client) {
-    SerializableRunnable closeCache =
-      new CacheSerializableRunnable("Close Client") {
-      public void run2() throws CacheException {
-        getLogWriter().info("### Close Client. ###");
-        try {
-          closeCache();
-          disconnectFromDS();
-        } catch (Exception ex) {
-          getLogWriter().info("### Failed to get close client. ###");
-        }
-      }
-    };
-    
-    client.invoke(closeCache);
-  }
-
-  public static class TestObject2 implements PdxSerializable {
-    public int _id;
-    public static int numInstance = 0;
-    
-    public TestObject2(){
-      numInstance++;
-    }
-    
-    public TestObject2(int id){
-      this._id = id;
-      numInstance++;
-    }
-    
-    public int getId() {
-      return this._id;
-    }
-    
-    public void toData(PdxWriter out) {
-      out.writeInt("id", this._id);
-    }
-    
-    public void fromData(PdxReader in) {
-      this._id = in.readInt("id");
-    }
-    
-    @Override
-    public boolean equals(Object o){
-      getLogWriter().info("In TestObject2.equals() this: " + this + " other :" + o);
-      GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject2.equals() this: " + this + " other :" + o);
-      TestObject2 other = (TestObject2)o;
-      if (_id == other._id) {
-        return true;
-      } else {
-        getLogWriter().info("NOT EQUALS");  
-        return false;
-      }
-    }
-    
-    @Override
-    public int hashCode(){
-      GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject2.hashCode() : " + this._id);
-      return this._id;
-    }
-  }
-
-  public static class TestObject implements PdxSerializable {
-      public static LogWriter log;
-      protected String _ticker;
-      protected int _price;
-      public int id;
-      public int important;
-      public int selection;
-      public int select;
-      public static int numInstance = 0;
-      public Map idTickers = new HashMap();
-      public HashMap positions = new HashMap();
-      public TestObject2 test;
-      
-      public TestObject() {
-        if (log != null) {
-          log.info("TestObject ctor stack trace", new Exception());
-        }
-        numInstance++;
-        //GemFireCacheImpl.getInstance().getLoggerI18n().fine(new Exception("DEBUG"));
-      }
-  
-      public TestObject(int id, String ticker) {
-        if (log != null) {
-          log.info("TestObject ctor stack trace", new Exception());
-        }
-        this.id = id;
-        this._ticker = ticker;
-        this._price = id;
-        this.important = id;
-        this.selection =id;
-        this.select =id;
-        //GemFireCacheImpl.getInstance().getLoggerI18n().fine(new Exception("DEBUG"));
-        numInstance++;
-        idTickers.put(id + "", ticker);
-        this.test = new TestObject2(id);
-      }
-  
-      public TestObject(int id, String ticker, int numPositions) {
-        this(id, ticker);
-        for (int i=0; i < numPositions; i++) {
-          positions.put(id + i, new PositionPdx(ticker + ":" +  id + ":" + i , (id + 100)));
-        }
-      }
-      
-      public int getIdValue() {
-        return this.id;
-      }
-  
-      public String getTicker() {
-        return this._ticker;
-      }
-  
-      public int getPriceValue() {
-        return this._price;
-      }
-  
-      public HashMap getPositions(String id) {
-        return this.positions;  
-      }
-  
-      public String getStatus(){
-        return (id % 2 == 0) ? "active" : "inactive";
-      }
-  
-      public void toData(PdxWriter out)
-      {
-        //System.out.println("Is serializing in WAN: " + GatewayEventImpl.isSerializingValue());
-        out.writeInt("id", this.id);
-        out.writeString("ticker", this._ticker);
-        out.writeInt("price", this._price);
-        out.writeObject("idTickers", this.idTickers);
-        out.writeObject("positions", this.positions);
-        out.writeObject("test", this.test);
-      }
-  
-      public void fromData(PdxReader in)
-      {
-        //System.out.println("Is deserializing in WAN: " + GatewayEventImpl.isDeserializingValue());
-        this.id = in.readInt("id");
-        this._ticker = in.readString("ticker");
-        this._price = in.readInt("price");
-        this.idTickers = (Map)in.readObject("idTickers");
-        this.positions = (HashMap)in.readObject("positions");
-        this.test = (TestObject2)in.readObject("test");
-      }
-  
-      public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer
-        .append("TestObject [")
-        .append("id=")
-        .append(this.id)
-        .append("; ticker=")
-        .append(this._ticker)
-        .append("; price=")
-        .append(this._price)
-        .append("]");
-        return buffer.toString();
-      }
-  
-      @Override
-      public boolean equals(Object o){
-  //      getLogWriter().info("In TestObject.equals() this: " + this + " other :" + o);
-  //      GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject.equals() this: " + this + " other :" + o);
-        TestObject other = (TestObject)o;
-        if ((id == other.id) && (_ticker.equals(other._ticker))) {
-          return true;
-        } else {
-  //        getLogWriter().info("NOT EQUALS");  
-          return false;
-        }
-      }
-      
-      @Override
-      public int hashCode(){
-        GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject.hashCode() : " + this.id);
-        return this.id;
-      }
-  
-    }
-
-  /**
-   * Starts a bridge server on the given port, using the given
-   * deserializeValues and notifyBySubscription to serve up the
-   * given region.
-   */
-  protected void startCacheServer(int port, boolean notifyBySubscription)
-      throws IOException {
-      
-        Cache cache = CacheFactory.getAnyInstance();
-        CacheServer bridge = cache.addCacheServer();
-        bridge.setPort(port);
-        bridge.setNotifyBySubscription(notifyBySubscription);
-        bridge.start();
-        bridgeServerPort = bridge.getPort();
-      }
-
-  public PdxQueryCQTestBase(String name) {
-    super(name);
-  }
-
-}
+/*
+ * 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.gemstone.gemfire.cache.query.dunit;
+
+import java.io.IOException;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
+import com.gemstone.gemfire.LogWriter;
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.PartitionAttributes;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.PoolFactory;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.query.CacheUtils;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqEvent;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.Query;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.Struct;
+import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryTestListener;
+import com.gemstone.gemfire.cache.query.data.PortfolioPdx;
+import com.gemstone.gemfire.cache.query.data.PositionPdx;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.compression.Compressor;
+import com.gemstone.gemfire.compression.SnappyCompressor;
+import com.gemstone.gemfire.i18n.LogWriterI18n;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.pdx.PdxReader;
+import com.gemstone.gemfire.pdx.PdxSerializable;
+import com.gemstone.gemfire.pdx.PdxWriter;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+public abstract class PdxQueryCQTestBase extends CacheTestCase {
+
+  /** The port on which the bridge server was started in this VM */
+  private static int bridgeServerPort;
+  protected static final Compressor compressor = SnappyCompressor.getDefaultInstance();
+  protected final String rootRegionName = "root";
+  protected final String regionName = "PdxTest";
+  protected final String regionName2 = "PdxTest2";
+  protected final String regName = "/" + rootRegionName + "/" + regionName;
+  protected final String regName2 = "/" + rootRegionName + "/" + regionName2;
+  protected final String[] queryString = new String[] {
+      "SELECT DISTINCT id FROM " + regName, // 0
+      "SELECT * FROM " + regName, // 1
+      "SELECT ticker FROM " + regName, // 2
+      "SELECT * FROM " + regName + " WHERE id > 5", // 3
+      "SELECT p FROM " + regName + " p, p.idTickers idTickers WHERE p.ticker = 'vmware'", // 4
+    };
+
+  private static int getCacheServerPort() {
+    return bridgeServerPort;
+  }
+
+  public void tearDown2() throws Exception {
+    disconnectAllFromDS(); // tests all expect to create a new ds
+    // Reset the testObject numinstance for the next test.
+    TestObject.numInstance = 0;
+    // In all VM.
+    resetTestObjectInstanceCount();    
+  }
+
+  private void resetTestObjectInstanceCount() {
+    final Host host = Host.getHost(0);
+    for (int i=0; i < 4; i++) {
+      VM vm = host.getVM(i);
+      vm.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+        public void run2() throws CacheException {
+          TestObject.numInstance = 0;
+          PortfolioPdx.numInstance = 0;
+          PositionPdx.numInstance = 0;
+          PositionPdx.cnt = 0;
+          TestObject2.numInstance = 0;
+        }
+      });
+    }
+  }
+
+  public void createPool(VM vm, String poolName, String server, int port,
+      boolean subscriptionEnabled) {
+        createPool(vm, poolName, new String[]{server}, new int[]{port}, subscriptionEnabled);  
+      }
+
+  public void createPool(VM vm, String poolName, String server, int port) {
+    createPool(vm, poolName, new String[]{server}, new int[]{port}, false);  
+  }
+
+  public void createPool(VM vm, final String poolName, final String[] servers, final int[] ports,
+      final boolean subscriptionEnabled) {
+        createPool(vm, poolName, servers, ports, subscriptionEnabled, 0);    
+      }
+
+  public void createPool(VM vm, final String poolName, final String[] servers, final int[] ports,
+      final boolean subscriptionEnabled, final int redundancy) {
+        vm.invoke(new CacheSerializableRunnable("createPool :" + poolName) {
+          public void run2() throws CacheException {
+            // Create Cache.
+            Properties props = new Properties();
+            props.setProperty("mcast-port", "0");
+            props.setProperty("locators", "");
+            getSystem(props );
+            getCache();        
+            PoolFactory cpf = PoolManager.createFactory();
+            cpf.setSubscriptionEnabled(subscriptionEnabled);
+            cpf.setSubscriptionRedundancy(redundancy);
+            for (int i=0; i < servers.length; i++){
+              getLogWriter().info("### Adding to Pool. ### Server : " + servers[i] + " Port : " + ports[i]);
+              cpf.addServer(servers[i], ports[i]);
+            }
+            cpf.create(poolName);
+          }
+        });   
+      }
+
+  public void executeClientQueries(VM vm, final String poolName, final String queryStr) {
+    vm.invoke(new CacheSerializableRunnable("Execute queries") {
+      public void run2() throws CacheException {
+        SelectResults results = null;
+        Comparator comparator = null;
+        Object[] resultsArray = null;
+        QueryService remoteQueryService = null;
+        QueryService localQueryService = null;
+        SelectResults[][] rs = new SelectResults[1][2];
+        
+        try {
+          remoteQueryService = (PoolManager.find(poolName)).getQueryService();
+          localQueryService = getCache().getQueryService();
+        } catch (Exception e) {
+          fail("Failed to get QueryService.", e);
+        }          
+  
+        try {
+          getLogWriter().info("### Executing Query on server:" + queryStr);
+          Query query = remoteQueryService.newQuery(queryStr);
+          rs[0][0] = (SelectResults)query.execute();
+          //printResults (rs[0][0], " ### Remote Query Results : ####");
+          getLogWriter().info("### Executing Query locally:" + queryStr);
+          query = localQueryService.newQuery(queryStr);
+          rs[0][1] = (SelectResults)query.execute();
+          getLogWriter().info("### Remote Query rs size: " + (rs[0][0]).size() + 
+              "Local Query rs size: " + (rs[0][1]).size());
+          //printResults (rs[0][1], " ### Local Query Results : ####");
+          // Compare local and remote query results.
+          if (!CacheUtils.compareResultsOfWithAndWithoutIndex(rs))
+          {
+             fail("Local and Remote Query Results are not matching for query :" + queryStr);  
+          }
+        } catch (Exception e) {
+          fail("Failed executing " + queryStr, e);
+        }
+      }
+    });
+  }
+
+  public void printResults(SelectResults results, String message) {
+    Object r;
+    Struct s;
+    LogWriterI18n logger = GemFireCacheImpl.getInstance().getLoggerI18n();
+    logger.fine(message);
+    int row = 0;
+    for (Iterator iter = results.iterator(); iter.hasNext(); ) {
+      r = iter.next();
+      row++;
+      if (r instanceof Struct) {
+         s = (Struct)r;
+         String[] fieldNames = ((Struct)r).getStructType().getFieldNames();
+         for (int i=0; i < fieldNames.length; i++){
+            logger.fine("### Row " + row  + "\n" + "Field: " +
+                fieldNames[i] + " > " + s.get(fieldNames[i]).toString());
+         }
+      } else {
+        logger.fine("#### Row " + row + "\n" + r);
+      }
+    }
+  }
+
+  protected void configAndStartBridgeServer() {
+    configAndStartBridgeServer(false, false, false, null); 
+  }
+
+  protected void configAndStartBridgeServer(boolean isPr, boolean isAccessor) {
+    configAndStartBridgeServer(false, false, false, null); 
+  }
+
+  protected void configAndStartBridgeServer(boolean isPr, boolean isAccessor,
+      boolean asyncIndex, Compressor compressor) {
+        AttributesFactory factory = new AttributesFactory();
+        if (isPr) {
+          PartitionAttributesFactory paf = new PartitionAttributesFactory();
+          //factory.setDataPolicy(DataPolicy.PARTITION);
+          if (isAccessor){
+            paf.setLocalMaxMemory(0);
+          }
+          PartitionAttributes prAttr = paf.setTotalNumBuckets(20).setRedundantCopies(0).create();
+          factory.setPartitionAttributes(prAttr);
+        } else {
+          factory.setScope(Scope.DISTRIBUTED_ACK);
+          factory.setDataPolicy(DataPolicy.REPLICATE);      
+        }
+        if (asyncIndex) {
+          factory.setIndexMaintenanceSynchronous(!asyncIndex);
+        }
+        if (compressor != null) {
+          factory.setCompressor(compressor);
+        }
+        
+        createRegion(this.regionName, this.rootRegionName, factory.create());
+        createRegion(this.regionName2, this.rootRegionName, factory.create());
+        
+        try {
+          startBridgeServer(0, false);
+        } catch (Exception ex) {
+          fail("While starting CacheServer", ex);
+        }
+      }
+
+  protected void executeCompiledQueries(String poolName, Object[][] params) {
+    SelectResults results = null;
+    Comparator comparator = null;
+    Object[] resultsArray = null;
+    QueryService qService = null;
+  
+    try {
+      qService = (PoolManager.find(poolName)).getQueryService();
+    } catch (Exception e) {
+      fail("Failed to get QueryService.", e);
+    }          
+  
+    for (int i=0; i < queryString.length; i++){
+      try {
+        getLogWriter().info("### Executing Query :" + queryString[i]);
+        Query query = qService.newQuery(queryString[i]);
+        results = (SelectResults)query.execute(params[i]);
+      } catch (Exception e) {
+        fail("Failed executing " + queryString[i], e);
+      }
+    }        
+  }
+
+  /**
+   * Starts a bridge server on the given port, using the given
+   * deserializeValues and notifyBySubscription to serve up the
+   * given region.
+   */
+  protected void startBridgeServer(int port, boolean notifyBySubscription)
+      throws IOException {
+      
+        Cache cache = getCache();
+        CacheServer bridge = cache.addCacheServer();
+        bridge.setPort(port);
+        bridge.setNotifyBySubscription(notifyBySubscription);
+        bridge.start();
+        bridgeServerPort = bridge.getPort();
+      }
+
+  /**
+   * Stops the bridge server that serves up the given cache.
+   */
+  protected void stopBridgeServer(Cache cache) {
+    CacheServer bridge =
+      (CacheServer) cache.getCacheServers().iterator().next();
+    bridge.stop();
+    assertFalse(bridge.isRunning());
+  }
+
+  public void closeClient(VM client) {
+    SerializableRunnable closeCache =
+      new CacheSerializableRunnable("Close Client") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Close Client. ###");
+        try {
+          closeCache();
+          disconnectFromDS();
+        } catch (Exception ex) {
+          getLogWriter().info("### Failed to get close client. ###");
+        }
+      }
+    };
+    
+    client.invoke(closeCache);
+  }
+
+  public static class TestObject2 implements PdxSerializable {
+    public int _id;
+    public static int numInstance = 0;
+    
+    public TestObject2(){
+      numInstance++;
+    }
+    
+    public TestObject2(int id){
+      this._id = id;
+      numInstance++;
+    }
+    
+    public int getId() {
+      return this._id;
+    }
+    
+    public void toData(PdxWriter out) {
+      out.writeInt("id", this._id);
+    }
+    
+    public void fromData(PdxReader in) {
+      this._id = in.readInt("id");
+    }
+    
+    @Override
+    public boolean equals(Object o){
+      getLogWriter().info("In TestObject2.equals() this: " + this + " other :" + o);
+      GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject2.equals() this: " + this + " other :" + o);
+      TestObject2 other = (TestObject2)o;
+      if (_id == other._id) {
+        return true;
+      } else {
+        getLogWriter().info("NOT EQUALS");  
+        return false;
+      }
+    }
+    
+    @Override
+    public int hashCode(){
+      GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject2.hashCode() : " + this._id);
+      return this._id;
+    }
+  }
+
+  public static class TestObject implements PdxSerializable {
+      public static LogWriter log;
+      protected String _ticker;
+      protected int _price;
+      public int id;
+      public int important;
+      public int selection;
+      public int select;
+      public static int numInstance = 0;
+      public Map idTickers = new HashMap();
+      public HashMap positions = new HashMap();
+      public TestObject2 test;
+      
+      public TestObject() {
+        if (log != null) {
+          log.info("TestObject ctor stack trace", new Exception());
+        }
+        numInstance++;
+        //GemFireCacheImpl.getInstance().getLoggerI18n().fine(new Exception("DEBUG"));
+      }
+  
+      public TestObject(int id, String ticker) {
+        if (log != null) {
+          log.info("TestObject ctor stack trace", new Exception());
+        }
+        this.id = id;
+        this._ticker = ticker;
+        this._price = id;
+        this.important = id;
+        this.selection =id;
+        this.select =id;
+        //GemFireCacheImpl.getInstance().getLoggerI18n().fine(new Exception("DEBUG"));
+        numInstance++;
+        idTickers.put(id + "", ticker);
+        this.test = new TestObject2(id);
+      }
+  
+      public TestObject(int id, String ticker, int numPositions) {
+        this(id, ticker);
+        for (int i=0; i < numPositions; i++) {
+          positions.put(id + i, new PositionPdx(ticker + ":" +  id + ":" + i , (id + 100)));
+        }
+      }
+      
+      public int getIdValue() {
+        return this.id;
+      }
+  
+      public String getTicker() {
+        return this._ticker;
+      }
+  
+      public int getPriceValue() {
+        return this._price;
+      }
+  
+      public HashMap getPositions(String id) {
+        return this.positions;  
+      }
+  
+      public String getStatus(){
+        return (id % 2 == 0) ? "active" : "inactive";
+      }
+  
+      public void toData(PdxWriter out)
+      {
+        //System.out.println("Is serializing in WAN: " + GatewayEventImpl.isSerializingValue());
+        out.writeInt("id", this.id);
+        out.writeString("ticker", this._ticker);
+        out.writeInt("price", this._price);
+        out.writeObject("idTickers", this.idTickers);
+        out.writeObject("positions", this.positions);
+        out.writeObject("test", this.test);
+      }
+  
+      public void fromData(PdxReader in)
+      {
+        //System.out.println("Is deserializing in WAN: " + GatewayEventImpl.isDeserializingValue());
+        this.id = in.readInt("id");
+        this._ticker = in.readString("ticker");
+        this._price = in.readInt("price");
+        this.idTickers = (Map)in.readObject("idTickers");
+        this.positions = (HashMap)in.readObject("positions");
+        this.test = (TestObject2)in.readObject("test");
+      }
+  
+      public String toString() {
+        StringBuffer buffer = new StringBuffer();
+        buffer
+        .append("TestObject [")
+        .append("id=")
+        .append(this.id)
+        .append("; ticker=")
+        .append(this._ticker)
+        .append("; price=")
+        .append(this._price)
+        .append("]");
+        return buffer.toString();
+      }
+  
+      @Override
+      public boolean equals(Object o){
+  //      getLogWriter().info("In TestObject.equals() this: " + this + " other :" + o);
+  //      GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject.equals() this: " + this + " other :" + o);
+        TestObject other = (TestObject)o;
+        if ((id == other.id) && (_ticker.equals(other._ticker))) {
+          return true;
+        } else {
+  //        getLogWriter().info("NOT EQUALS");  
+          return false;
+        }
+      }
+      
+      @Override
+      public int hashCode(){
+        GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject.hashCode() : " + this.id);
+        return this.id;
+      }
+  
+    }
+
+  /**
+   * Starts a bridge server on the given port, using the given
+   * deserializeValues and notifyBySubscription to serve up the
+   * given region.
+   */
+  protected void startCacheServer(int port, boolean notifyBySubscription)
+      throws IOException {
+      
+        Cache cache = CacheFactory.getAnyInstance();
+        CacheServer bridge = cache.addCacheServer();
+        bridge.setPort(port);
+        bridge.setNotifyBySubscription(notifyBySubscription);
+        bridge.start();
+        bridgeServerPort = bridge.getPort();
+      }
+
+  public PdxQueryCQTestBase(String name) {
+    super(name);
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
index fa4f610..8f80f48 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * 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.gemstone.gemfire.cache.query.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
index 1f1758d..f421273 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * 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.gemstone.gemfire.cache.query.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
index 9d9557c..5ccaeb3 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * 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.gemstone.gemfire.cache.snapshot;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
index f0fffa7..231f018 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
@@ -1,70 +1,79 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-package com.gemstone.gemfire.codeAnalysis;
-
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.experimental.categories.Category;
-
-import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
-import com.gemstone.gemfire.util.test.TestUtil;
-
-/**
- * @author bruces
- * 
- */
-@Category(IntegrationTest.class)
-public class AnalyzeCQSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
-  
-  @Before
-  public void loadClasses() throws Exception {
-    if (classes.size() > 0) {
-      return;
-    }
-    System.out.println("loadClasses starting");
-    List<String> excludedClasses = loadExcludedClasses(new File(TestUtil.getResourcePath(AnalyzeCQSerializablesJUnitTest.class, "excludedClasses.txt")));
-    List<String> openBugs = loadOpenBugs(new File(TestUtil.getResourcePath(AnalyzeCQSerializablesJUnitTest.class, "openBugs.txt")));
-    excludedClasses.addAll(openBugs);
-    
-    String cp = System.getProperty("java.class.path");
-    System.out.println("java classpath is " + cp);
-    System.out.flush();
-    String[] entries = cp.split(File.pathSeparator);
-    String buildDirName =
-         "gemfire-cq"+File.separatorChar
-        +"build"+File.separatorChar
-        +"classes"+File.separatorChar
-        +"main";
-    String buildDir = null;
-    
-    for (int i=0; i<entries.length  &&  buildDir==null; i++) {
-      System.out.println("examining '" + entries[i] + "'");
-      System.out.flush();
-      if (entries[i].endsWith(buildDirName)) {
-        buildDir = entries[i];
-      }
-    }
-    if (buildDir != null) {
-      System.out.println("loading class files from " + buildDir);
-      System.out.flush();
-      long start = System.currentTimeMillis();
-      loadClassesFromBuild(new File(buildDir), excludedClasses);
-      long finish = System.currentTimeMillis();
-      System.out.println("done loading " + classes.size() + " classes.  elapsed time = "
-          + (finish-start)/1000 + " seconds");
-    }
-    else {
-      fail("unable to find CQ classes");
-    }
-  }
-  
-}
+/*
+ * 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.gemstone.gemfire.codeAnalysis;
+
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import com.gemstone.gemfire.util.test.TestUtil;
+
+/**
+ * @author bruces
+ * 
+ */
+@Category(IntegrationTest.class)
+public class AnalyzeCQSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
+  
+  @Before
+  public void loadClasses() throws Exception {
+    if (classes.size() > 0) {
+      return;
+    }
+    System.out.println("loadClasses starting");
+    List<String> excludedClasses = loadExcludedClasses(new File(TestUtil.getResourcePath(AnalyzeCQSerializablesJUnitTest.class, "excludedClasses.txt")));
+    List<String> openBugs = loadOpenBugs(new File(TestUtil.getResourcePath(AnalyzeCQSerializablesJUnitTest.class, "openBugs.txt")));
+    excludedClasses.addAll(openBugs);
+    
+    String cp = System.getProperty("java.class.path");
+    System.out.println("java classpath is " + cp);
+    System.out.flush();
+    String[] entries = cp.split(File.pathSeparator);
+    String buildDirName =
+         "gemfire-cq"+File.separatorChar
+        +"build"+File.separatorChar
+        +"classes"+File.separatorChar
+        +"main";
+    String buildDir = null;
+    
+    for (int i=0; i<entries.length  &&  buildDir==null; i++) {
+      System.out.println("examining '" + entries[i] + "'");
+      System.out.flush();
+      if (entries[i].endsWith(buildDirName)) {
+        buildDir = entries[i];
+      }
+    }
+    if (buildDir != null) {
+      System.out.println("loading class files from " + buildDir);
+      System.out.flush();
+      long start = System.currentTimeMillis();
+      loadClassesFromBuild(new File(buildDir), excludedClasses);
+      long finish = System.currentTimeMillis();
+      System.out.println("done loading " + classes.size() + " classes.  elapsed time = "
+          + (finish-start)/1000 + " seconds");
+    }
+    else {
+      fail("unable to find CQ classes");
+    }
+  }
+  
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
index 061655a..4810e28 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * 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.gemstone.gemfire.internal.cache;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
index 6a8cfa9..3737ffb 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * 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.gemstone.gemfire.internal.cache;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
index 6413518..0f089c5 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * 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.gemstone.gemfire.internal.cache;
 /*=========================================================================
  * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
index 05eb566..4bce2ac 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
+/*
+ * 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.gemstone.gemfire.internal.cache.ha;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
index 649297e..2f64285 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * 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.gemstone.gemfire.internal.cache.ha;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
index cf434b3..968eda9 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * 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.gemstone.gemfire.internal.cache.tier.sockets;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
index dc2f1f4..382b056 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * 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.gemstone.gemfire.internal.cache.tier.sockets;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
index 096c831..6902619 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * 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.gemstone.gemfire.internal.cache.tier.sockets;