Skip to content

Commit 8a9833b

Browse files
committed
Fix issues after merge
1 parent 166dc6c commit 8a9833b

File tree

7 files changed

+8
-9
lines changed

7 files changed

+8
-9
lines changed

src/org/opensolaris/opengrok/web/api/constraints/PositiveDuration.java renamed to opengrok-indexer/src/main/java/org/opengrok/indexer/web/api/constraints/PositiveDuration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/*
2121
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
2222
*/
23-
package org.opensolaris.opengrok.web.api.constraints;
23+
package org.opengrok.indexer.web.api.constraints;
2424

2525
import javax.validation.Constraint;
2626
import javax.validation.Payload;

src/org/opensolaris/opengrok/web/api/constraints/PositiveDurationValidator.java renamed to opengrok-indexer/src/main/java/org/opengrok/indexer/web/api/constraints/PositiveDurationValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/*
2121
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
2222
*/
23-
package org.opensolaris.opengrok.web.api.constraints;
23+
package org.opengrok.indexer.web.api.constraints;
2424

2525
import javax.validation.ConstraintValidator;
2626
import javax.validation.ConstraintValidatorContext;

test/org/opensolaris/opengrok/web/api/constraint/PositiveDurationValidatorTest.java renamed to opengrok-indexer/src/test/java/org/opengrok/indexer/web/api/constraints/PositiveDurationValidatorTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@
2020
/*
2121
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
2222
*/
23-
package org.opensolaris.opengrok.web.api.constraint;
23+
package org.opengrok.indexer.web.api.constraints;
2424

2525
import org.junit.Test;
26-
import org.opensolaris.opengrok.web.api.constraints.PositiveDurationValidator;
2726

2827
import java.time.Duration;
2928

src/org/opensolaris/opengrok/web/api/error/ExceptionMapperUtils.java renamed to opengrok-web/src/main/java/org/opengrok/web/api/error/ExceptionMapperUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/*
2121
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
2222
*/
23-
package org.opensolaris.opengrok.web.api.error;
23+
package org.opengrok.web.api.error;
2424

2525
import javax.ws.rs.core.MediaType;
2626
import javax.ws.rs.core.Response;

src/org/opensolaris/opengrok/web/api/error/GenericExceptionMapper.java renamed to opengrok-web/src/main/java/org/opengrok/web/api/error/GenericExceptionMapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
/*
2121
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
2222
*/
23-
package org.opensolaris.opengrok.web.api.error;
23+
package org.opengrok.web.api.error;
2424

25-
import org.opensolaris.opengrok.logger.LoggerFactory;
25+
import org.opengrok.indexer.logger.LoggerFactory;
2626

2727
import javax.ws.rs.core.Response;
2828
import javax.ws.rs.ext.ExceptionMapper;

src/org/opensolaris/opengrok/web/api/error/ValidationExceptionMapper.java renamed to opengrok-web/src/main/java/org/opengrok/web/api/error/ValidationExceptionMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/*
2121
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
2222
*/
23-
package org.opensolaris.opengrok.web.api.error;
23+
package org.opengrok.web.api.error;
2424

2525
import javax.validation.ValidationException;
2626
import javax.ws.rs.core.Response;

src/org/opensolaris/opengrok/web/api/error/WebApplicationExceptionMapper.java renamed to opengrok-web/src/main/java/org/opengrok/web/api/error/WebApplicationExceptionMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/*
2121
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
2222
*/
23-
package org.opensolaris.opengrok.web.api.error;
23+
package org.opengrok.web.api.error;
2424

2525
import javax.ws.rs.WebApplicationException;
2626
import javax.ws.rs.core.Response;

0 commit comments

Comments
 (0)