Repository: incubator-distributedlog Updated Branches: refs/heads/master 52c0eef87 -> c44e0278e
http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/c44e0278/distributedlog-service/src/test/java/org/apache/distributedlog/service/stream/limiter/TestServiceRequestLimiter.java ---------------------------------------------------------------------- diff --git a/distributedlog-service/src/test/java/org/apache/distributedlog/service/stream/limiter/TestServiceRequestLimiter.java b/distributedlog-service/src/test/java/org/apache/distributedlog/service/stream/limiter/TestServiceRequestLimiter.java deleted file mode 100644 index 431bfa4..0000000 --- a/distributedlog-service/src/test/java/org/apache/distributedlog/service/stream/limiter/TestServiceRequestLimiter.java +++ /dev/null @@ -1,301 +0,0 @@ -/** - * 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.distributedlog.service.stream.limiter; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import org.apache.distributedlog.DistributedLogConfiguration; -import org.apache.distributedlog.config.ConcurrentConstConfiguration; -import org.apache.distributedlog.config.DynamicDistributedLogConfiguration; -import org.apache.distributedlog.exceptions.OverCapacityException; -import org.apache.distributedlog.limiter.ChainedRequestLimiter; -import org.apache.distributedlog.limiter.ComposableRequestLimiter; -import org.apache.distributedlog.limiter.ComposableRequestLimiter.CostFunction; -import org.apache.distributedlog.limiter.ComposableRequestLimiter.OverlimitFunction; -import org.apache.distributedlog.limiter.GuavaRateLimiter; -import org.apache.distributedlog.limiter.RateLimiter; -import org.apache.distributedlog.limiter.RequestLimiter; -import java.util.concurrent.atomic.AtomicInteger; -import org.apache.bookkeeper.feature.SettableFeature; -import org.apache.bookkeeper.stats.NullStatsLogger; -import org.junit.Test; - -/** - * Test Case for {@link ServiceRequestLimiter}. - */ -public class TestServiceRequestLimiter { - - /** - * Mock Request. - */ - class MockRequest { - int size; - MockRequest() { - this(1); - } - MockRequest(int size) { - this.size = size; - } - int getSize() { - return size; - } - } - - /** - * Mock request limiter. - */ - class MockRequestLimiter implements RequestLimiter<MockRequest> { - public void apply(MockRequest request) { - } - } - - /** - * Counter based limiter. - */ - static class CounterLimiter implements RateLimiter { - final int limit; - int count; - - public CounterLimiter(int limit) { - this.limit = limit; - this.count = 0; - } - - @Override - public boolean acquire(int permits) { - if (++count > limit) { - return false; - } - return true; - } - } - - /** - * Mock hard request limiter. - */ - class MockHardRequestLimiter implements RequestLimiter<MockRequest> { - - RequestLimiter<MockRequest> limiter; - int limitHitCount; - - MockHardRequestLimiter(int limit) { - this(GuavaRateLimiter.of(limit)); - } - - MockHardRequestLimiter(RateLimiter limiter) { - this.limiter = new ComposableRequestLimiter<MockRequest>( - limiter, - new OverlimitFunction<MockRequest>() { - public void apply(MockRequest request) throws OverCapacityException { - limitHitCount++; - throw new OverCapacityException("Limit exceeded"); - } - }, - new CostFunction<MockRequest>() { - public int apply(MockRequest request) { - return request.getSize(); - } - }, - NullStatsLogger.INSTANCE); - } - - @Override - public void apply(MockRequest op) throws OverCapacityException { - limiter.apply(op); - } - - public int getLimitHitCount() { - return limitHitCount; - } - } - - /** - * Mock soft request limiter. - */ - class MockSoftRequestLimiter implements RequestLimiter<MockRequest> { - - RequestLimiter<MockRequest> limiter; - int limitHitCount; - - MockSoftRequestLimiter(int limit) { - this(GuavaRateLimiter.of(limit)); - } - - MockSoftRequestLimiter(RateLimiter limiter) { - this.limiter = new ComposableRequestLimiter<MockRequest>( - limiter, - new OverlimitFunction<MockRequest>() { - public void apply(MockRequest request) throws OverCapacityException { - limitHitCount++; - } - }, - new CostFunction<MockRequest>() { - public int apply(MockRequest request) { - return request.getSize(); - } - }, - NullStatsLogger.INSTANCE); - } - - @Override - public void apply(MockRequest op) throws OverCapacityException { - limiter.apply(op); - } - - public int getLimitHitCount() { - return limitHitCount; - } - } - - @Test(timeout = 60000) - public void testDynamicLimiter() throws Exception { - final AtomicInteger id = new AtomicInteger(0); - final DynamicDistributedLogConfiguration dynConf = new DynamicDistributedLogConfiguration( - new ConcurrentConstConfiguration(new DistributedLogConfiguration())); - DynamicRequestLimiter<MockRequest> limiter = new DynamicRequestLimiter<MockRequest>( - dynConf, NullStatsLogger.INSTANCE, new SettableFeature("", 0)) { - @Override - public RequestLimiter<MockRequest> build() { - id.getAndIncrement(); - return new MockRequestLimiter(); - } - }; - limiter.initialize(); - assertEquals(1, id.get()); - dynConf.setProperty("test1", 1); - assertEquals(2, id.get()); - dynConf.setProperty("test2", 2); - assertEquals(3, id.get()); - } - - @Test(timeout = 60000) - public void testDynamicLimiterWithDisabledFeature() throws Exception { - final DynamicDistributedLogConfiguration dynConf = new DynamicDistributedLogConfiguration( - new ConcurrentConstConfiguration(new DistributedLogConfiguration())); - final MockSoftRequestLimiter rateLimiter = new MockSoftRequestLimiter(0); - final SettableFeature disabledFeature = new SettableFeature("", 0); - DynamicRequestLimiter<MockRequest> limiter = new DynamicRequestLimiter<MockRequest>( - dynConf, NullStatsLogger.INSTANCE, disabledFeature) { - @Override - public RequestLimiter<MockRequest> build() { - return rateLimiter; - } - }; - limiter.initialize(); - assertEquals(0, rateLimiter.getLimitHitCount()); - - // Not disabled, rate limiter was invoked - limiter.apply(new MockRequest(Integer.MAX_VALUE)); - assertEquals(1, rateLimiter.getLimitHitCount()); - - // Disabled, rate limiter not invoked - disabledFeature.set(1); - limiter.apply(new MockRequest(Integer.MAX_VALUE)); - assertEquals(1, rateLimiter.getLimitHitCount()); - } - - @Test(timeout = 60000) - public void testDynamicLimiterWithException() throws Exception { - final AtomicInteger id = new AtomicInteger(0); - final DynamicDistributedLogConfiguration dynConf = new DynamicDistributedLogConfiguration( - new ConcurrentConstConfiguration(new DistributedLogConfiguration())); - DynamicRequestLimiter<MockRequest> limiter = new DynamicRequestLimiter<MockRequest>( - dynConf, NullStatsLogger.INSTANCE, new SettableFeature("", 0)) { - @Override - public RequestLimiter<MockRequest> build() { - if (id.incrementAndGet() >= 2) { - throw new RuntimeException("exception in dynamic limiter build()"); - } - return new MockRequestLimiter(); - } - }; - limiter.initialize(); - assertEquals(1, id.get()); - try { - dynConf.setProperty("test1", 1); - fail("should have thrown on config failure"); - } catch (RuntimeException ex) { - } - assertEquals(2, id.get()); - } - - @Test(timeout = 60000) - public void testServiceRequestLimiter() throws Exception { - MockHardRequestLimiter limiter = new MockHardRequestLimiter(new CounterLimiter(1)); - limiter.apply(new MockRequest()); - try { - limiter.apply(new MockRequest()); - } catch (OverCapacityException ex) { - } - assertEquals(1, limiter.getLimitHitCount()); - } - - @Test(timeout = 60000) - public void testServiceRequestLimiterWithDefaultRate() throws Exception { - MockHardRequestLimiter limiter = new MockHardRequestLimiter(-1); - limiter.apply(new MockRequest(Integer.MAX_VALUE)); - limiter.apply(new MockRequest(Integer.MAX_VALUE)); - assertEquals(0, limiter.getLimitHitCount()); - } - - @Test(timeout = 60000) - public void testServiceRequestLimiterWithZeroRate() throws Exception { - MockHardRequestLimiter limiter = new MockHardRequestLimiter(0); - try { - limiter.apply(new MockRequest(1)); - fail("should have failed with overcap"); - } catch (OverCapacityException ex) { - } - assertEquals(1, limiter.getLimitHitCount()); - } - - @Test(timeout = 60000) - public void testChainedServiceRequestLimiter() throws Exception { - MockSoftRequestLimiter softLimiter = new MockSoftRequestLimiter(new CounterLimiter(1)); - MockHardRequestLimiter hardLimiter = new MockHardRequestLimiter(new CounterLimiter(3)); - - RequestLimiter<MockRequest> limiter = - new ChainedRequestLimiter.Builder<MockRequest>() - .addLimiter(softLimiter) - .addLimiter(hardLimiter) - .build(); - - assertEquals(0, softLimiter.getLimitHitCount()); - assertEquals(0, hardLimiter.getLimitHitCount()); - - limiter.apply(new MockRequest()); - assertEquals(0, softLimiter.getLimitHitCount()); - assertEquals(0, hardLimiter.getLimitHitCount()); - - limiter.apply(new MockRequest()); - assertEquals(1, softLimiter.getLimitHitCount()); - assertEquals(0, hardLimiter.getLimitHitCount()); - - limiter.apply(new MockRequest()); - assertEquals(2, softLimiter.getLimitHitCount()); - assertEquals(0, hardLimiter.getLimitHitCount()); - - try { - limiter.apply(new MockRequest()); - } catch (OverCapacityException ex) { - } - assertEquals(3, softLimiter.getLimitHitCount()); - assertEquals(1, hardLimiter.getLimitHitCount()); - } -} http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/c44e0278/distributedlog-service/src/test/java/org/apache/distributedlog/service/streamset/TestDelimiterStreamPartitionConverter.java ---------------------------------------------------------------------- diff --git a/distributedlog-service/src/test/java/org/apache/distributedlog/service/streamset/TestDelimiterStreamPartitionConverter.java b/distributedlog-service/src/test/java/org/apache/distributedlog/service/streamset/TestDelimiterStreamPartitionConverter.java deleted file mode 100644 index 15a0753..0000000 --- a/distributedlog-service/src/test/java/org/apache/distributedlog/service/streamset/TestDelimiterStreamPartitionConverter.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * 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.distributedlog.service.streamset; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -/** - * Test Cases for {@link DelimiterStreamPartitionConverter}. - */ -public class TestDelimiterStreamPartitionConverter { - - @Test(timeout = 20000) - public void testNormalStream() throws Exception { - StreamPartitionConverter converter = new DelimiterStreamPartitionConverter(); - assertEquals(new Partition("distributedlog-smoketest", 1), - converter.convert("distributedlog-smoketest_1")); - assertEquals(new Partition("distributedlog-smoketest-", 1), - converter.convert("distributedlog-smoketest-_1")); - assertEquals(new Partition("distributedlog-smoketest", 1), - converter.convert("distributedlog-smoketest_000001")); - } - - private void assertIdentify(String streamName, StreamPartitionConverter converter) { - assertEquals(new Partition(streamName, 0), converter.convert(streamName)); - } - - @Test(timeout = 20000) - public void testUnknownStream() throws Exception { - StreamPartitionConverter converter = new DelimiterStreamPartitionConverter(); - assertIdentify("test1", converter); - assertIdentify("test1-000001", converter); - assertIdentify("test1_test1_000001", converter); - assertIdentify("test1_test1", converter); - } -} http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/c44e0278/distributedlog-service/src/test/java/org/apache/distributedlog/service/streamset/TestIdentityStreamPartitionConverter.java ---------------------------------------------------------------------- diff --git a/distributedlog-service/src/test/java/org/apache/distributedlog/service/streamset/TestIdentityStreamPartitionConverter.java b/distributedlog-service/src/test/java/org/apache/distributedlog/service/streamset/TestIdentityStreamPartitionConverter.java deleted file mode 100644 index 1a5d8d3..0000000 --- a/distributedlog-service/src/test/java/org/apache/distributedlog/service/streamset/TestIdentityStreamPartitionConverter.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * 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.distributedlog.service.streamset; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -/** - * Test Case for {@link IdentityStreamPartitionConverter}. - */ -public class TestIdentityStreamPartitionConverter { - - @Test(timeout = 20000) - public void testIdentityConverter() { - String streamName = "test-identity-converter"; - - IdentityStreamPartitionConverter converter = - new IdentityStreamPartitionConverter(); - - Partition p0 = converter.convert(streamName); - assertEquals(new Partition(streamName, 0), p0); - - Partition p1 = converter.convert(streamName); - assertTrue(p0 == p1); - } -} http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/c44e0278/distributedlog-service/src/test/java/org/apache/distributedlog/service/streamset/TestPartitionMap.java ---------------------------------------------------------------------- diff --git a/distributedlog-service/src/test/java/org/apache/distributedlog/service/streamset/TestPartitionMap.java b/distributedlog-service/src/test/java/org/apache/distributedlog/service/streamset/TestPartitionMap.java deleted file mode 100644 index b6e5ff3..0000000 --- a/distributedlog-service/src/test/java/org/apache/distributedlog/service/streamset/TestPartitionMap.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * 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.distributedlog.service.streamset; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -/** - * Test {@link PartitionMap}. - */ -public class TestPartitionMap { - - @Test(timeout = 20000) - public void testAddPartitionNegativeMax() { - PartitionMap map = new PartitionMap(); - for (int i = 0; i < 20; i++) { - assertTrue(map.addPartition(new Partition("test", i), -1)); - } - } - - @Test(timeout = 20000) - public void testAddPartitionMultipleTimes() { - PartitionMap map = new PartitionMap(); - for (int i = 0; i < 20; i++) { - assertTrue(map.addPartition(new Partition("test", 0), 3)); - } - } - - @Test(timeout = 20000) - public void testAddPartition() { - PartitionMap map = new PartitionMap(); - for (int i = 0; i < 3; i++) { - assertTrue(map.addPartition(new Partition("test", i), 3)); - } - for (int i = 3; i < 20; i++) { - assertFalse(map.addPartition(new Partition("test", i), 3)); - } - } - - @Test(timeout = 20000) - public void testRemovePartition() { - PartitionMap map = new PartitionMap(); - for (int i = 0; i < 3; i++) { - assertTrue(map.addPartition(new Partition("test", i), 3)); - } - assertFalse(map.addPartition(new Partition("test", 3), 3)); - assertFalse(map.removePartition(new Partition("test", 3))); - assertTrue(map.removePartition(new Partition("test", 0))); - assertTrue(map.addPartition(new Partition("test", 3), 3)); - } -} http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/c44e0278/distributedlog-service/src/test/java/org/apache/distributedlog/service/utils/TestServerUtils.java ---------------------------------------------------------------------- diff --git a/distributedlog-service/src/test/java/org/apache/distributedlog/service/utils/TestServerUtils.java b/distributedlog-service/src/test/java/org/apache/distributedlog/service/utils/TestServerUtils.java deleted file mode 100644 index 2853df1..0000000 --- a/distributedlog-service/src/test/java/org/apache/distributedlog/service/utils/TestServerUtils.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * 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.distributedlog.service.utils; - -import static org.junit.Assert.assertEquals; - -import java.net.InetAddress; -import org.junit.Test; - -/** - * Test Case for {@link ServerUtils}. - */ -public class TestServerUtils { - - @Test(timeout = 6000) - public void testGetLedgerAllocatorPoolName() throws Exception { - int region = 123; - int shard = 999; - String hostname = InetAddress.getLocalHost().getHostAddress(); - assertEquals("allocator_0123_0000000999", - ServerUtils.getLedgerAllocatorPoolName(region, shard, false)); - assertEquals("allocator_0123_" + hostname, - ServerUtils.getLedgerAllocatorPoolName(region, shard, true)); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/c44e0278/distributedlog-service/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/distributedlog-service/src/test/resources/log4j.properties b/distributedlog-service/src/test/resources/log4j.properties deleted file mode 100644 index 3e51059..0000000 --- a/distributedlog-service/src/test/resources/log4j.properties +++ /dev/null @@ -1,51 +0,0 @@ -#/** -# * 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. -# */ - -# -# DisributedLog Logging Configuration -# - -# Example with rolling log file -log4j.rootLogger=INFO, CONSOLE - -#disable zookeeper logging -log4j.logger.org.apache.zookeeper=OFF -#Set the bookkeeper level to warning -log4j.logger.org.apache.bookkeeper=INFO - -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.Threshold=INFO -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{1}@%L] - %m%n - -# Add ROLLINGFILE to rootLogger to get log file output -# Log DEBUG level and above messages to a log file -#log4j.appender.ROLLINGFILE=org.apache.log4j.DailyRollingFileAppender -#log4j.appender.ROLLINGFILE.Threshold=INFO -#log4j.appender.ROLLINGFILE.File=distributedlog.log -#log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout -#log4j.appender.ROLLINGFILE.DatePattern='.'yyyy-MM-dd-HH-mm -#log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{1}@%L] - %m%n - -log4j.appender.R=org.apache.log4j.RollingFileAppender -log4j.appender.R.Threshold=TRACE -log4j.appender.R.File=target/error.log -log4j.appender.R.MaxFileSize=200MB -log4j.appender.R.MaxBackupIndex=7 -log4j.appender.R.layout=org.apache.log4j.PatternLayout -log4j.appender.R.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{1}@%L] - %m%n http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/c44e0278/distributedlog-tutorials/distributedlog-basic/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-basic/pom.xml b/distributedlog-tutorials/distributedlog-basic/pom.xml index 34ce4f7..fde8e56 100644 --- a/distributedlog-tutorials/distributedlog-basic/pom.xml +++ b/distributedlog-tutorials/distributedlog-basic/pom.xml @@ -39,7 +39,7 @@ </dependency> <dependency> <groupId>org.apache.distributedlog</groupId> - <artifactId>distributedlog-client</artifactId> + <artifactId>distributedlog-proxy-client</artifactId> <version>${project.parent.version}</version> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/c44e0278/distributedlog-tutorials/distributedlog-mapreduce/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-mapreduce/pom.xml b/distributedlog-tutorials/distributedlog-mapreduce/pom.xml index d477221..7a6b67a 100644 --- a/distributedlog-tutorials/distributedlog-mapreduce/pom.xml +++ b/distributedlog-tutorials/distributedlog-mapreduce/pom.xml @@ -39,7 +39,7 @@ </dependency> <dependency> <groupId>org.apache.distributedlog</groupId> - <artifactId>distributedlog-client</artifactId> + <artifactId>distributedlog-proxy-client</artifactId> <version>${project.parent.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/c44e0278/distributedlog-tutorials/distributedlog-messaging/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-messaging/pom.xml b/distributedlog-tutorials/distributedlog-messaging/pom.xml index cb6a1a7..97af77b 100644 --- a/distributedlog-tutorials/distributedlog-messaging/pom.xml +++ b/distributedlog-tutorials/distributedlog-messaging/pom.xml @@ -39,7 +39,7 @@ </dependency> <dependency> <groupId>org.apache.distributedlog</groupId> - <artifactId>distributedlog-client</artifactId> + <artifactId>distributedlog-proxy-client</artifactId> <version>${project.parent.version}</version> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/c44e0278/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d10eb85..dafda4a 100644 --- a/pom.xml +++ b/pom.xml @@ -85,8 +85,9 @@ <module>distributedlog-build-tools</module> <module>distributedlog-protocol</module> <module>distributedlog-core</module> - <module>distributedlog-client</module> - <module>distributedlog-service</module> + <module>distributedlog-proxy-protocol</module> + <module>distributedlog-proxy-client</module> + <module>distributedlog-proxy-server</module> <module>distributedlog-benchmark</module> <module>distributedlog-tutorials</module> </modules> @@ -230,6 +231,8 @@ <exclude>**/**.md</exclude> <exclude>scripts/dev/reviewers</exclude> <exclude>src/main/resources/DISCLAIMER.bin.txt</exclude> + <exclude>**/dependency-reduced-pom.xml</exclude> + <exclude>**/org/apache/distributedlog/thrift/*</exclude> </excludes> </configuration> </plugin>
