Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

removed dep on internal repos; fixes testcases

  • Loading branch information...
commit 087d454251ccee4fb0ef3a5aac746df85f7fc750 1 parent bc3f16c
Shwetha GS authored
Showing with 278 additions and 46 deletions.
  1. +18 −0 client/src/main/java/org/apache/ivory/Tag.java
  2. +18 −0 client/src/main/java/org/apache/ivory/entity/v0/Frequency.java
  3. +18 −0 client/src/main/java/org/apache/ivory/entity/v0/SchemaHelper.java
  4. +18 −0 client/src/main/java/org/apache/ivory/resource/InstancesResult.java
  5. +18 −0 client/src/test/java/org/apache/ivory/entity/v0/TestFrequency.java
  6. +18 −0 common/src/main/java/org/apache/ivory/entity/EntityUtil.java
  7. +18 −0 common/src/main/java/org/apache/ivory/entity/ExternalId.java
  8. +18 −0 common/src/main/java/org/apache/ivory/entity/ProcessHelper.java
  9. +18 −0 common/src/main/java/org/apache/ivory/entity/parser/CrossEntityValidations.java
  10. +18 −0 common/src/main/java/org/apache/ivory/update/UpdateHelper.java
  11. +18 −0 common/src/main/java/org/apache/ivory/util/BuildProperties.java
  12. +0 −18 common/src/main/resources/expression-validation.properties
  13. +18 −0 common/src/test/java/org/apache/ivory/entity/ColoClusterRelationTest.java
  14. +18 −0 common/src/test/java/org/apache/ivory/entity/EntityUtilTest.java
  15. +18 −0 common/src/test/java/org/apache/ivory/entity/FeedHelperTest.java
  16. +18 −0 common/src/test/java/org/apache/ivory/entity/store/ConfigurationStoreTest.java
  17. +1 −1  oozie/pom.xml
  18. +2 −22 pom.xml
  19. +2 −2 replication/pom.xml
  20. +3 −3 retention/src/test/java/org/apache/ivory/retention/FeedEvictorTest.java
View
18 client/src/main/java/org/apache/ivory/Tag.java
@@ -1,3 +1,21 @@
+/*
+ * 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.apache.ivory;
import org.apache.ivory.entity.v0.EntityType;
View
18 client/src/main/java/org/apache/ivory/entity/v0/Frequency.java
@@ -1,3 +1,21 @@
+/*
+ * 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.apache.ivory.entity.v0;
import java.util.Calendar;
View
18 client/src/main/java/org/apache/ivory/entity/v0/SchemaHelper.java
@@ -1,3 +1,21 @@
+/*
+ * 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.apache.ivory.entity.v0;
import java.text.DateFormat;
View
18 client/src/main/java/org/apache/ivory/resource/InstancesResult.java
@@ -1,3 +1,21 @@
+/*
+ * 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.apache.ivory.resource;
import java.util.Date;
View
18 client/src/test/java/org/apache/ivory/entity/v0/TestFrequency.java
@@ -1,3 +1,21 @@
+/*
+ * 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.apache.ivory.entity.v0;
import org.testng.Assert;
View
18 common/src/main/java/org/apache/ivory/entity/EntityUtil.java
@@ -1,3 +1,21 @@
+/*
+ * 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.apache.ivory.entity;
import java.lang.reflect.Method;
View
18 common/src/main/java/org/apache/ivory/entity/ExternalId.java
@@ -1,3 +1,21 @@
+/*
+ * 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.apache.ivory.entity;
import org.apache.commons.lang.StringUtils;
View
18 common/src/main/java/org/apache/ivory/entity/ProcessHelper.java
@@ -1,3 +1,21 @@
+/*
+ * 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.apache.ivory.entity;
import org.apache.ivory.entity.v0.process.Cluster;
View
18 common/src/main/java/org/apache/ivory/entity/parser/CrossEntityValidations.java
@@ -1,3 +1,21 @@
+/*
+ * 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.apache.ivory.entity.parser;
import java.util.Date;
View
18 common/src/main/java/org/apache/ivory/update/UpdateHelper.java
@@ -1,3 +1,21 @@
+/*
+ * 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.apache.ivory.update;
import java.util.ArrayList;
View
18 common/src/main/java/org/apache/ivory/util/BuildProperties.java
@@ -1,3 +1,21 @@
+/*
+ * 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.apache.ivory.util;
import org.apache.ivory.IvoryException;
View
18 common/src/main/resources/expression-validation.properties
@@ -1,18 +0,0 @@
-generic.L_P.pattern=\\s*\\(\\s*
-generic.R_P.pattern=\\s*\\)
-generic.NUM.pattern=([-]?[\\d]+)
-generic.COMMA.pattern=\\s*,\\s*
-
-instance.now.pattern=now${L_P}${NUM}${COMMA}${NUM}${R_P}
-instance.today.pattern=today${L_P}${NUM}${COMMA}${NUM}${R_P}
-instance.yesterday.pattern=yesterday${L_P}${NUM}${COMMA}${NUM}${R_P}
-instance.currentMonth.pattern=currentMonth${L_P}${NUM}${COMMA}${NUM}${COMMA}${NUM}${R_P}
-instance.lastMonth.pattern=lastMonth${L_P}${NUM}${COMMA}${NUM}${COMMA}${NUM}${R_P}
-instance.currentYear.pattern=currentYear${L_P}${NUM}${COMMA}${NUM}${COMMA}${NUM}${COMMA}${NUM}${R_P}
-instance.lastYear.pattern=lastYear${L_P}${NUM}${COMMA}${NUM}${COMMA}${NUM}${COMMA}${NUM}${R_P}
-
-duration.minutes.pattern=minutes\\([\\d]+\\)
-duration.hours.pattern=hours\\([\\d]+\\)
-duration.days.pattern=days\\([\\d]+\\)
-duration.months.pattern=months\\([\\d]+\\)
-duration.years.pattern=years\\([\\d]+\\)
View
18 common/src/test/java/org/apache/ivory/entity/ColoClusterRelationTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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.apache.ivory.entity;
import org.testng.Assert;
View
18 common/src/test/java/org/apache/ivory/entity/EntityUtilTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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.apache.ivory.entity;
import java.text.DateFormat;
View
18 common/src/test/java/org/apache/ivory/entity/FeedHelperTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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.apache.ivory.entity;
import org.apache.ivory.entity.v0.cluster.Cluster;
View
18 common/src/test/java/org/apache/ivory/entity/store/ConfigurationStoreTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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.apache.ivory.entity.store;
import org.apache.hadoop.conf.Configuration;
View
2  oozie/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-client</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
View
24 pom.xml
@@ -76,31 +76,11 @@
<url>https://github.com/sriksun/Ivory</url>
</scm>
- <distributionManagement>
- <repository>
- <id>InMobiRepository</id>
- <name>InMobi Internal Repository</name>
- <url>http://build.corp.inmobi.com/nexus/content/repositories/snapshots</url>
- </repository>
- </distributionManagement>
-
<repositories>
<repository>
- <id>internal.snapshots</id>
- <url>http://maven.scm.corp.inmobi.com/content/repositories/data-snapshot</url>
- </repository>
- <repository>
- <id>internal.snapshots.tmp</id>
- <url>http://build.corp.inmobi.com/nexus/content/repositories/snapshots</url>
- </repository>
- <repository>
- <id>internal.releases.tmp</id>
- <url>http://build.corp.inmobi.com/nexus/content/repositories/releases</url>
- </repository>
- <repository>
- <id>internal.releases</id>
- <url>http://maven.scm.corp.inmobi.com/content/repositories/data-release</url>
+ <id>inmobi.repo</id>
+ <url>https://github.com/InMobi/mvn-repo/raw/master/releases/</url>
</repository>
<repository>
<id>default</id>
View
4 replication/pom.xml
@@ -32,9 +32,9 @@
<packaging>jar</packaging>
<dependencies>
<dependency>
- <groupId>org.apache.hadoop.tools</groupId>
+ <groupId>org.apache.hadoop.inmobi.tools</groupId>
<artifactId>hadoop-distcp</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.3</version>
</dependency>
</dependencies>
View
6 retention/src/test/java/org/apache/ivory/retention/FeedEvictorTest.java
@@ -82,7 +82,7 @@ public void testEviction2() throws Exception {
stream.clear();
Pair<List<String>, List<String>> pair;
- pair = createTestData("feed1", "yyyy-MM-dd", 10, TimeUnit.DAYS);
+ pair = createTestData("feed1", "yyyy-MM-dd/'more'/yyyy", 10, TimeUnit.DAYS);
String dataPath = "/data/YYYY/feed1/mmHH/dd/MM/?{YEAR}-?{MONTH}-?{DAY}/more/?{YEAR}";
String logFile = "/ivory/staging/feed/instancePaths-2012-01-01-01-00.csv";
@@ -160,7 +160,7 @@ public void testEviction3() throws Exception {
stream.clear();
Pair<List<String>, List<String>> pair;
- pair = createTestData("feed2", "yyyyMMddHH", 5, TimeUnit.HOURS);
+ pair = createTestData("feed2", "yyyyMMddHH/'more'/yyyy", 5, TimeUnit.HOURS);
String dataPath = "/data/YYYY/feed2/mmHH/dd/MM/" +
"?{YEAR}?{MONTH}?{DAY}?{HOUR}/more/?{YEAR}";
String logFile = "/ivory/staging/feed/instancePaths-2012-01-01-02-00.csv";
@@ -281,7 +281,7 @@ public void testEviction4() throws Exception {
date > now - timeUnit.toMillis(range + 6);
date -= timeUnit.toMillis(1)) {
String path = "/data/YYYY/" + feed + "/mmHH/dd/MM/" +
- format.format(date) + "/more/2012";
+ format.format(date);
touch(fs, path);
if (date <= now && date > now - timeUnit.toMillis(range)) {
outOfRange.add(path);
Please sign in to comment.
Something went wrong with that request. Please try again.