Package rename only #49

Merged
merged 8 commits into from Feb 8, 2014

Conversation

Projects
None yet
3 participants
Member

snoopdave commented Feb 7, 2014

Here's what I've done in this branch:

  1. Used Netbeans refactoring tools to rename all Stack, Java and Android SDK packages from org.usergrid to org.apache.usergrid

  2. In the Stack, Java and Android SDK modules, did a global replace of org.usergrid with org.apache.usergrid, and of org/usergrid with org/apache/usergrid.

  3. In the REST module, added the old Usergrid Java SDK 0.0.3 jars in a local Maven module so we don't have to upgrade Jackson as part of the rename. In the Android SDK module, added the old Usergrid Java SDK 0.0.6 jars because that is the version it depends on.

  4. Regenerated the Javadoc API docs for both the Java and Android SDKs.

  5. Downgraded from Recaptcha 0.0.8 to 0.0.7 because the former is not in Maven Central. Also, downgraded from AppleJavaExtensions 1.5 to 1.4 for the same reason.

  6. I upped the version numbers to:

    Stack 0.0.29-SNAPSHOT
    Java SDK 0.0.9-SNAPSHOT
    Android SDK 0.0.7-SNAPSHOT

All Stack tests are now passing and I think this is ready for master. We still need to get rid of those local jars and upgrade the newer versions of Jackson (and Jersey) but that is a (huge) task for another day.

This work is for https://issues.apache.org/jira/browse/USERGRID-2

@ghost

ghost commented Feb 7, 2014

This is looking great!

Member

snoopdave commented Feb 7, 2014

Please hold off on merging this PR, I think I just found a launcher issue.

Also, I'd like to give people time for feedback since this is such a biggie.

zznate commented Feb 7, 2014

Does it make sense to split off b5d399b - I feel like that is the long pole in the tent in terms of surface area for folks working on other stuff.

Member

snoopdave commented Feb 7, 2014

@zznate what would the benefit of splitting out the Stack vs. SDK changes here?

zznate commented Feb 7, 2014

Thinking strictly in terms of blocking - it seems like a couple of the folks over the horizon were in the midst of a couple of things. If you feel like you can clean up the launcher issue quickly than no worries.

zznate commented Feb 7, 2014

@snoopdave just noticed the reference to USERGRID-2 - big "never mind" as these two issues def. takes priority, IMO.

Member

snoopdave commented Feb 8, 2014

OK, launcher now works and I believe this PR is ready to merge.

Member

sungjuly commented Feb 8, 2014

@snoopdave Great job!

zznate commented Feb 8, 2014

From a clean checkout of the github repo with this branch:

  • compiled
  • tests pass
  • launcher works (with and w/o GUI)

I have a merge conflict with the work @stliu did with for USERGRID-77 (f564f0) . I'm going to see if I can straighten that out.

zznate commented Feb 8, 2014

Word!

zznate merged commit c18448c into master Feb 8, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment