You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/02 18:12:31 UTC
[52/60] incubator-trafodion git commit: Minor T4 driver fix Fixed
duplicate copyright in dcs files
Minor T4 driver fix
Fixed duplicate copyright in dcs files
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8ed58bf6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8ed58bf6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8ed58bf6
Branch: refs/heads/master
Commit: 8ed58bf6389015275646f83298ca2bf067f817f9
Parents: 5955e92
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Tue Apr 26 16:18:13 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Tue Apr 26 16:18:13 2016 +0000
----------------------------------------------------------------------
core/conn/jdbcT4/Makefile | 2 +-
.../java/org/trafodion/jdbc/t4/BaseTest.java | 60 --------------------
.../org/trafodion/jdbc/t4/T4DriverTest.java | 6 +-
.../trafodion/dcs/zookeeper/DcsQuorumPeer.java | 22 +------
.../org/trafodion/dcs/zookeeper/ZKConfig.java | 21 +------
.../trafodion/dcs/zookeeper/ZKServerTool.java | 24 +-------
.../org/trafodion/dcs/zookeeper/ZkClient.java | 22 +------
.../org/trafodion/dcs/zookeeper/ZkUtil.java | 23 +-------
.../dcs/zookeeper/ZooKeeperMainServerArg.java | 23 +-------
9 files changed, 14 insertions(+), 189 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8ed58bf6/core/conn/jdbcT4/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/Makefile b/core/conn/jdbcT4/Makefile
index 189a053..6006abb 100644
--- a/core/conn/jdbcT4/Makefile
+++ b/core/conn/jdbcT4/Makefile
@@ -27,7 +27,7 @@ all: build_all
build_all:
echo "$(MAVEN) package -DskipTests"
- set -o pipefail && $(MAVEN) package | tee build_jdbct4.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
+ set -o pipefail && $(MAVEN) package -DskipTests | tee build_jdbct4.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
cp target/jdbcT4-${TRAFODION_VER}.jar ${MY_SQROOT}/export/lib
mkdir -p ../clients
mv target/jdbcT4-${TRAFODION_VER}.zip ../clients
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8ed58bf6/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/BaseTest.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/BaseTest.java b/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/BaseTest.java
deleted file mode 100644
index 71a9486..0000000
--- a/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/BaseTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* @@@ START COPYRIGHT @@@
-*
-* 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.
-*
-* @@@ END COPYRIGHT @@@ */
-package org.trafodion.jdbc.t4;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-
-public class BaseTest {
-
- /**
- * @throws java.lang.Exception
- */
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8ed58bf6/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java b/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java
index 5619784..e44c97a 100644
--- a/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java
+++ b/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java
@@ -18,7 +18,9 @@
* specific language governing permissions and limitations
* under the License.
*
-* @@@ END COPYRIGHT @@@ */
+* @@@ END COPYRIGHT @@@
+*/
+
package org.trafodion.jdbc.t4;
import java.sql.SQLException;
@@ -27,7 +29,7 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-public class T4DriverTest extends BaseTest {
+public class T4DriverTest {
private static T4Driver driver;
@BeforeClass
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8ed58bf6/dcs/src/main/java/org/trafodion/dcs/zookeeper/DcsQuorumPeer.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/zookeeper/DcsQuorumPeer.java b/dcs/src/main/java/org/trafodion/dcs/zookeeper/DcsQuorumPeer.java
index 62883f9..bb7dede 100644
--- a/dcs/src/main/java/org/trafodion/dcs/zookeeper/DcsQuorumPeer.java
+++ b/dcs/src/main/java/org/trafodion/dcs/zookeeper/DcsQuorumPeer.java
@@ -19,27 +19,7 @@ specific language governing permissions and limitations
under the License.
* @@@ END COPYRIGHT @@@
- */
-/**
- * Copyright 2010 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+*/
package org.trafodion.dcs.zookeeper;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8ed58bf6/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKConfig.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKConfig.java b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKConfig.java
index 57095f4..1e5d2f2 100644
--- a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKConfig.java
+++ b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKConfig.java
@@ -19,26 +19,7 @@ specific language governing permissions and limitations
under the License.
* @@@ END COPYRIGHT @@@
- */
-/**
- * Copyright 2010 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+*/
package org.trafodion.dcs.zookeeper;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8ed58bf6/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKServerTool.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKServerTool.java b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKServerTool.java
index 728ce63..eabb47f 100644
--- a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKServerTool.java
+++ b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKServerTool.java
@@ -19,27 +19,7 @@ specific language governing permissions and limitations
under the License.
* @@@ END COPYRIGHT @@@
- */
-/**
- * Copyright 2010 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+*/
package org.trafodion.dcs.zookeeper;
import java.util.Properties;
@@ -73,4 +53,4 @@ public class ZKServerTool {
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8ed58bf6/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkClient.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkClient.java b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkClient.java
index 6ad4be7..1d69d95 100644
--- a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkClient.java
+++ b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkClient.java
@@ -19,27 +19,7 @@ specific language governing permissions and limitations
under the License.
* @@@ END COPYRIGHT @@@
- */
-/**
- * Copyright 2011 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+*/
package org.trafodion.dcs.zookeeper;
import java.io.*;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8ed58bf6/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkUtil.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkUtil.java b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkUtil.java
index a66ecfa..5598cd5 100644
--- a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkUtil.java
+++ b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkUtil.java
@@ -19,26 +19,7 @@ specific language governing permissions and limitations
under the License.
* @@@ END COPYRIGHT @@@
- */
-/**
- * Copyright 2011 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+*/
package org.trafodion.dcs.zookeeper;
@@ -107,4 +88,4 @@ public class ZkUtil {
System.exit(1);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8ed58bf6/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.java b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.java
index 5843717..159fe0d 100644
--- a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.java
+++ b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.java
@@ -19,26 +19,7 @@ specific language governing permissions and limitations
under the License.
* @@@ END COPYRIGHT @@@
- */
-/**
- * Copyright 2010 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+*/
package org.trafodion.dcs.zookeeper;
@@ -87,4 +68,4 @@ public class ZooKeeperMainServerArg {
System.out.println((hostport == null || hostport.length() == 0)? "":
"-server " + hostport);
}
-}
\ No newline at end of file
+}