diff --git a/petclinic-application/pom.xml b/petclinic-application/pom.xml index eca4a88b6..b7abc4a22 100644 --- a/petclinic-application/pom.xml +++ b/petclinic-application/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.springframework.samples + ru.cicd.samples spring-petclinic 2.0 diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/PetClinicApplication.java similarity index 95% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/PetClinicApplication.java index cf0c5e301..8d91a3f14 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/PetClinicApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic; +package ru.cicd.samples.petclinic; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/model/BaseEntity.java similarity index 96% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/model/BaseEntity.java index 8350eb744..c95768efb 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/model/BaseEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.model; +package ru.cicd.samples.petclinic.model; import java.io.Serializable; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/model/NamedEntity.java similarity index 95% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/model/NamedEntity.java index cc596a194..98de347de 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/model/NamedEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.model; +package ru.cicd.samples.petclinic.model; import javax.persistence.Column; import javax.persistence.MappedSuperclass; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/model/Person.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/model/Person.java similarity index 96% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/model/Person.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/model/Person.java index 883376fbc..2eb76f86e 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/model/Person.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/model/Person.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.model; +package ru.cicd.samples.petclinic.model; import javax.persistence.Column; import javax.persistence.MappedSuperclass; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/model/package-info.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/model/package-info.java similarity index 92% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/model/package-info.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/model/package-info.java index 13c1673d5..80fe6db63 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/model/package-info.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/model/package-info.java @@ -17,5 +17,5 @@ /** * The classes in this package represent utilities used by the domain. */ -package org.springframework.samples.petclinic.model; +package ru.cicd.samples.petclinic.model; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/Owner.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/Owner.java similarity index 97% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/Owner.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/Owner.java index 5b1b7fb36..c7ac9818b 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/Owner.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/Owner.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package ru.cicd.samples.petclinic.owner; import java.util.ArrayList; import java.util.Collections; @@ -32,7 +32,7 @@ import javax.validation.constraints.NotEmpty; import org.springframework.beans.support.MutableSortDefinition; import org.springframework.beans.support.PropertyComparator; import org.springframework.core.style.ToStringCreator; -import org.springframework.samples.petclinic.model.Person; +import ru.cicd.samples.petclinic.model.Person; /** * Simple JavaBean domain object representing an owner. diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/OwnerController.java similarity index 98% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/OwnerController.java index fca15d8e5..c560bc162 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/OwnerController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package ru.cicd.samples.petclinic.owner; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/OwnerRepository.java similarity index 97% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/OwnerRepository.java index a5803f36a..a2b0a4663 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/OwnerRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package ru.cicd.samples.petclinic.owner; import java.util.Collection; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/Pet.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/Pet.java similarity index 94% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/Pet.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/Pet.java index 7ded757bd..b810cb6ce 100755 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/Pet.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/Pet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package ru.cicd.samples.petclinic.owner; import java.time.LocalDate; import java.util.ArrayList; @@ -35,8 +35,8 @@ import javax.persistence.Table; import org.springframework.beans.support.MutableSortDefinition; import org.springframework.beans.support.PropertyComparator; import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.samples.petclinic.model.NamedEntity; -import org.springframework.samples.petclinic.visit.Visit; +import ru.cicd.samples.petclinic.model.NamedEntity; +import ru.cicd.samples.petclinic.visit.Visit; /** * Simple business object representing a pet. diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/PetController.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetController.java similarity index 98% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/PetController.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetController.java index 0107aa8a9..f0184e33f 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/PetController.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package ru.cicd.samples.petclinic.owner; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/PetRepository.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetRepository.java similarity index 97% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/PetRepository.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetRepository.java index 0d483b7ad..5b88ec7dc 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/PetRepository.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package ru.cicd.samples.petclinic.owner; import java.util.List; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/PetType.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetType.java similarity index 87% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/PetType.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetType.java index 19c27bee3..283d4a06c 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/PetType.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetType.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package ru.cicd.samples.petclinic.owner; import javax.persistence.Entity; import javax.persistence.Table; -import org.springframework.samples.petclinic.model.NamedEntity; +import ru.cicd.samples.petclinic.model.NamedEntity; /** * @author Juergen Hoeller diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetTypeFormatter.java similarity index 97% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetTypeFormatter.java index 4423482a3..ce424c8c6 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetTypeFormatter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package ru.cicd.samples.petclinic.owner; import java.text.ParseException; import java.util.Collection; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetValidator.java similarity index 97% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetValidator.java index 3e8438b33..7643c6d7b 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetValidator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package ru.cicd.samples.petclinic.owner; import org.springframework.util.StringUtils; import org.springframework.validation.Errors; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/VisitController.java similarity index 93% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/VisitController.java index d4d674dc7..0bf3919fe 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/VisitController.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package ru.cicd.samples.petclinic.owner; -import org.springframework.samples.petclinic.visit.Visit; -import org.springframework.samples.petclinic.visit.VisitRepository; +import ru.cicd.samples.petclinic.visit.Visit; +import ru.cicd.samples.petclinic.visit.VisitRepository; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; import org.springframework.web.bind.WebDataBinder; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/system/CacheConfiguration.java similarity index 97% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/system/CacheConfiguration.java index 9d4a53c64..1a88a757b 100755 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/system/CacheConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.system; +package ru.cicd.samples.petclinic.system; import org.springframework.boot.autoconfigure.cache.JCacheManagerCustomizer; import org.springframework.cache.annotation.EnableCaching; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/system/CrashController.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/system/CrashController.java similarity index 95% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/system/CrashController.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/system/CrashController.java index 05be70429..a7b609747 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/system/CrashController.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/system/CrashController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.system; +package ru.cicd.samples.petclinic.system; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/system/WelcomeController.java similarity index 94% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/system/WelcomeController.java index 7e96848b6..15b4fcd1f 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/system/WelcomeController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.system; +package ru.cicd.samples.petclinic.system; import org.springframework.stereotype.Controller; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/Specialty.java similarity index 89% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/Specialty.java index ea8ec6ded..7861ad4f2 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/Specialty.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.vet; +package ru.cicd.samples.petclinic.vet; import java.io.Serializable; import javax.persistence.Entity; import javax.persistence.Table; -import org.springframework.samples.petclinic.model.NamedEntity; +import ru.cicd.samples.petclinic.model.NamedEntity; /** * Models a {@link Vet Vet's} specialty (for example, dentistry). diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/vet/Vet.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/Vet.java similarity index 95% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/vet/Vet.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/Vet.java index 33b449129..5e84af376 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/vet/Vet.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/Vet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.vet; +package ru.cicd.samples.petclinic.vet; import java.util.ArrayList; import java.util.Collections; @@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlElement; import org.springframework.beans.support.MutableSortDefinition; import org.springframework.beans.support.PropertyComparator; -import org.springframework.samples.petclinic.model.Person; +import ru.cicd.samples.petclinic.model.Person; /** * Simple JavaBean domain object representing a veterinarian. diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/vet/VetController.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/VetController.java similarity index 97% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/vet/VetController.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/VetController.java index f15f40b2c..a06bfe159 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/vet/VetController.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/VetController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.vet; +package ru.cicd.samples.petclinic.vet; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/VetRepository.java similarity index 96% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/VetRepository.java index 1f70182fd..c4f786226 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/VetRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.vet; +package ru.cicd.samples.petclinic.vet; import java.util.Collection; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/vet/Vets.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/Vets.java similarity index 95% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/vet/Vets.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/Vets.java index ab29f7a54..f90570371 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/vet/Vets.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/Vets.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.vet; +package ru.cicd.samples.petclinic.vet; import java.util.ArrayList; import java.util.List; diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/visit/Visit.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/visit/Visit.java similarity index 94% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/visit/Visit.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/visit/Visit.java index 03c9deedf..4463fb5e6 100755 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/visit/Visit.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/visit/Visit.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.visit; +package ru.cicd.samples.petclinic.visit; import java.time.LocalDate; @@ -23,7 +23,7 @@ import javax.persistence.Table; import javax.validation.constraints.NotEmpty; import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.samples.petclinic.model.BaseEntity; +import ru.cicd.samples.petclinic.model.BaseEntity; /** * Simple JavaBean domain object representing a visit. diff --git a/petclinic-application/src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/visit/VisitRepository.java similarity index 92% rename from petclinic-application/src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java rename to petclinic-application/src/main/java/ru/cicd/samples/petclinic/visit/VisitRepository.java index 42b58618b..91f9a2db8 100644 --- a/petclinic-application/src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java +++ b/petclinic-application/src/main/java/ru/cicd/samples/petclinic/visit/VisitRepository.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.visit; +package ru.cicd.samples.petclinic.visit; import java.util.List; import org.springframework.dao.DataAccessException; import org.springframework.data.repository.Repository; -import org.springframework.samples.petclinic.model.BaseEntity; +import ru.cicd.samples.petclinic.model.BaseEntity; /** * Repository class for Visit domain objects All method names are compliant with Spring Data naming diff --git a/petclinic-application/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/PetclinicIntegrationTests.java similarity index 91% rename from petclinic-application/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java rename to petclinic-application/src/test/java/ru/cicd/samples/petclinic/PetclinicIntegrationTests.java index 669dbddaa..929118e73 100644 --- a/petclinic-application/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java +++ b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/PetclinicIntegrationTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.samples.petclinic; +package ru.cicd.samples.petclinic; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.samples.petclinic.vet.VetRepository; +import ru.cicd.samples.petclinic.vet.VetRepository; import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) diff --git a/petclinic-application/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/model/ValidatorTests.java similarity index 97% rename from petclinic-application/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java rename to petclinic-application/src/test/java/ru/cicd/samples/petclinic/model/ValidatorTests.java index e37a96562..ca0a19e0f 100644 --- a/petclinic-application/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java +++ b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/model/ValidatorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.model; +package ru.cicd.samples.petclinic.model; import java.util.Locale; import java.util.Set; diff --git a/petclinic-application/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/owner/OwnerControllerTests.java similarity index 96% rename from petclinic-application/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java rename to petclinic-application/src/test/java/ru/cicd/samples/petclinic/owner/OwnerControllerTests.java index c1ba09364..4b05b9e41 100644 --- a/petclinic-application/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java +++ b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/owner/OwnerControllerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package ru.cicd.samples.petclinic.owner; import static org.hamcrest.Matchers.hasProperty; import static org.hamcrest.Matchers.is; @@ -32,9 +32,6 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.samples.petclinic.owner.Owner; -import org.springframework.samples.petclinic.owner.OwnerController; -import org.springframework.samples.petclinic.owner.OwnerRepository; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; diff --git a/petclinic-application/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/owner/PetControllerTests.java similarity index 91% rename from petclinic-application/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java rename to petclinic-application/src/test/java/ru/cicd/samples/petclinic/owner/PetControllerTests.java index 2ffae3025..dc933d0f0 100755 --- a/petclinic-application/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java +++ b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/owner/PetControllerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package ru.cicd.samples.petclinic.owner; import static org.mockito.BDDMockito.given; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; @@ -32,13 +32,6 @@ import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.FilterType; -import org.springframework.samples.petclinic.owner.Owner; -import org.springframework.samples.petclinic.owner.OwnerRepository; -import org.springframework.samples.petclinic.owner.Pet; -import org.springframework.samples.petclinic.owner.PetController; -import org.springframework.samples.petclinic.owner.PetRepository; -import org.springframework.samples.petclinic.owner.PetType; -import org.springframework.samples.petclinic.owner.PetTypeFormatter; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; diff --git a/petclinic-application/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/owner/PetTypeFormatterTests.java similarity index 98% rename from petclinic-application/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java rename to petclinic-application/src/test/java/ru/cicd/samples/petclinic/owner/PetTypeFormatterTests.java index 9ba431480..808d3edd3 100644 --- a/petclinic-application/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java +++ b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/owner/PetTypeFormatterTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package ru.cicd.samples.petclinic.owner; import java.text.ParseException; import java.util.ArrayList; diff --git a/petclinic-application/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/owner/VisitControllerTests.java similarity index 90% rename from petclinic-application/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java rename to petclinic-application/src/test/java/ru/cicd/samples/petclinic/owner/VisitControllerTests.java index 3edd20959..cb1d85961 100644 --- a/petclinic-application/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java +++ b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/owner/VisitControllerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package ru.cicd.samples.petclinic.owner; import static org.mockito.BDDMockito.given; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; @@ -29,10 +29,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.samples.petclinic.owner.Pet; -import org.springframework.samples.petclinic.owner.PetRepository; -import org.springframework.samples.petclinic.owner.VisitController; -import org.springframework.samples.petclinic.visit.VisitRepository; +import ru.cicd.samples.petclinic.visit.VisitRepository; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; diff --git a/petclinic-application/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/service/ClinicServiceTests.java similarity index 92% rename from petclinic-application/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java rename to petclinic-application/src/test/java/ru/cicd/samples/petclinic/service/ClinicServiceTests.java index c103caac0..6f901f4ae 100644 --- a/petclinic-application/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java +++ b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/service/ClinicServiceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.service; +package ru.cicd.samples.petclinic.service; import static org.assertj.core.api.Assertions.assertThat; @@ -26,15 +26,15 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.context.annotation.ComponentScan; -import org.springframework.samples.petclinic.owner.Owner; -import org.springframework.samples.petclinic.owner.OwnerRepository; -import org.springframework.samples.petclinic.owner.Pet; -import org.springframework.samples.petclinic.owner.PetRepository; -import org.springframework.samples.petclinic.owner.PetType; -import org.springframework.samples.petclinic.vet.Vet; -import org.springframework.samples.petclinic.vet.VetRepository; -import org.springframework.samples.petclinic.visit.Visit; -import org.springframework.samples.petclinic.visit.VisitRepository; +import ru.cicd.samples.petclinic.owner.Owner; +import ru.cicd.samples.petclinic.owner.OwnerRepository; +import ru.cicd.samples.petclinic.owner.Pet; +import ru.cicd.samples.petclinic.owner.PetRepository; +import ru.cicd.samples.petclinic.owner.PetType; +import ru.cicd.samples.petclinic.vet.Vet; +import ru.cicd.samples.petclinic.vet.VetRepository; +import ru.cicd.samples.petclinic.visit.Visit; +import ru.cicd.samples.petclinic.visit.VisitRepository; import org.springframework.stereotype.Service; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; diff --git a/petclinic-application/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/service/EntityUtils.java similarity index 90% rename from petclinic-application/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java rename to petclinic-application/src/test/java/ru/cicd/samples/petclinic/service/EntityUtils.java index 8890cc59a..ca52a9bde 100644 --- a/petclinic-application/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java +++ b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/service/EntityUtils.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.service; +package ru.cicd.samples.petclinic.service; import java.util.Collection; import org.springframework.orm.ObjectRetrievalFailureException; -import org.springframework.samples.petclinic.model.BaseEntity; +import ru.cicd.samples.petclinic.model.BaseEntity; /** * Utility methods for handling entities. Separate from the BaseEntity class mainly because of dependency on the @@ -27,7 +27,7 @@ import org.springframework.samples.petclinic.model.BaseEntity; * * @author Juergen Hoeller * @author Sam Brannen - * @see org.springframework.samples.petclinic.model.BaseEntity + * @see BaseEntity * @since 29.10.2003 */ public abstract class EntityUtils { diff --git a/petclinic-application/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/system/CrashControllerTests.java similarity index 97% rename from petclinic-application/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java rename to petclinic-application/src/test/java/ru/cicd/samples/petclinic/system/CrashControllerTests.java index cc1e235cb..a22d82b30 100644 --- a/petclinic-application/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java +++ b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/system/CrashControllerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.system; +package ru.cicd.samples.petclinic.system; import org.junit.Ignore; import org.junit.Test; diff --git a/petclinic-application/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/vet/VetControllerTests.java similarity index 98% rename from petclinic-application/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java rename to petclinic-application/src/test/java/ru/cicd/samples/petclinic/vet/VetControllerTests.java index 83ef50144..119ab96a3 100644 --- a/petclinic-application/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java +++ b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/vet/VetControllerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.vet; +package ru.cicd.samples.petclinic.vet; import static org.mockito.BDDMockito.given; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; diff --git a/petclinic-application/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/vet/VetTests.java similarity index 96% rename from petclinic-application/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java rename to petclinic-application/src/test/java/ru/cicd/samples/petclinic/vet/VetTests.java index 542250751..3dbffacc2 100644 --- a/petclinic-application/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java +++ b/petclinic-application/src/test/java/ru/cicd/samples/petclinic/vet/VetTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.vet; +package ru.cicd.samples.petclinic.vet; import org.junit.Test; diff --git a/petclinic-container/pom.xml b/petclinic-container/pom.xml index 21d45f5bc..f5fd284ec 100644 --- a/petclinic-container/pom.xml +++ b/petclinic-container/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.springframework.samples + ru.cicd.samples spring-petclinic 2.0 @@ -16,7 +16,7 @@ petclinic-containers - docker-build + docker @@ -61,7 +61,7 @@ - org.springframework.samples + ru.cicd.samples petclinic-application ${project.version} jar @@ -80,7 +80,7 @@ ${mojo-exec.version} - docker-package + build package exec @@ -92,7 +92,21 @@ build . -t - ${project.groupId}/${project.artifactId}:${project.version} + ${docker-registry}/${project.groupId}/${project.artifactId}:${project.version} + + + + + push + deploy + + exec + + + docker + + push + ${docker-registry}/${project.groupId}/${project.artifactId}:${project.version} @@ -104,6 +118,3 @@ - diff --git a/pom.xml b/pom.xml index 0e2f75c87..ac4007487 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ - org.springframework.samples + ru.cicd.samples spring-petclinic 2.0 petclinic-modular-parent @@ -46,6 +46,7 @@ 2.8.1 1.6.0 3.1.0 + registry.ci-cd.ru:16000