Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: 80dc1e6fd1d18aa85188ac5849dc6a98c2f9458e https://github.com/hibernate/hibernate-orm/commit/80dc1e6fd1d18aa85188ac5... Author: Brett Meyer <brett(a)3riverdev.com&gt; Date: 2013-06-05 (Wed, 05 Jun 2013) Changed paths: M documentation/src/main/docbook/devguide/en-US/chapters/osgi/OSGi.xml A documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/.gitignore M documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/pom.xml A documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/.gitignore M documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/pom.xml A documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/.gitignore M documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/pom.xml M documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/DataPointService.java M documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java A documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/GetCommand.java A documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/LoadCommand.java M documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/entity/DataPoint.java M documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/OSGI-INF/blueprint/blueprint.xml Log Message: ----------- HHH-8265 Documented the reasoning for importing o.h.proxy and javassist.util.proxy in the quickstarts. Added a load proxy test. Conflicts: documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/entity/DataPoint.java